Updated template with better git handling.