cleaning up the site and getting things in order
Merge branch 'gh-pages'