Style fixes and other stuff
Merge pull request #8 from Nuevosmedios/gerson-templates

Style fixes and other stuff