Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Update rake tasks so they can run from any branch.
  Move files to master from gh-pages
Update jekyll files from this fiddle
Merge branch 'master' into gh-pages

* master:
  Update jekyll files from this fiddle