Fixing busted index.html
Adding viewport meta
Setting initial-scale and max-scale in viewport meta
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	index.html