Refactored templates. Fixes #4
Renamed a block and fixed a formatting issue
Merge pull request #21 from futurice-oss/templates

Refactored templates. Fixes #4