Moving to a gh-pages format
Merge branch 'master' into gh-pages