Back to basics, removed all template code
Merge branch 'master' into gh-pages