pull template.html back in
Merge branch 'master' into gh-pages
remove html from gitignore