First pass at cleaning up index.html and home.tpl.html
Merge branch 'master' into development