Move files from gh-pages
Improve rake tasks so jekyll can be used from any branch
Merge branch 'master' into gh-pages

* master:
  Improve rake tasks so jekyll can be used from any branch
  Move files from gh-pages