Bug fixes

• turbot template build now cleans up branches after a rebase failure.