Merge branch 'master' into gh-pages
me being anal
Merge branch 'gh-pages'