Removed cruft from templates
Merge branch 'master' of https://github.com/MorusAB/fixmystreet