Rename rake tasks
Merge branch 'master' into gh-pages

* master:
  Rename rake tasks
Fix publish rake task