Merge branch 'gh-pages'
Nicified footer
Merge branch 'master' into gh-pages