Tweaked twig style guide text
Renamed git conventions and added tips