Clean up HTML template
Merge branch 'master' of https://github.com/whump/yapcna2013
Cleanup comments after pulling in Joe's patch.