Merge pull request #194 from tpkelly/gh-pages-dev

Front page tweaks
Removed html pages from beautifier
Merge pull request #195 from niksoper/gh-pages-dev

Removed html pages from beautifier
Merge branch 'upstream' into gh-pages-dev