Clean up whitespace.
Remove some duplication in the templates.
Enable reloading of the templates.
Merge pull request #1 from alkemist/master

Some minor improvements by alkemist (Luke Daley)