Merge branch 'gh-pages'
Merge branch 'gh-pages'
cosmetic improvements as jeremys is win
Merge branch 'master' into gh-pages