Move files to master from gh-pages
Update rake tasks so they can run from any branch.
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