Merge branch 'gh-pages' of git://github.com/thomaspark/bootswatch into gh-pages