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

* master:
  Rename rake tasks
Fix publish rake task
Fix publish rake task
Merge branch 'master' into gh-pages

* master:
  Fix publish rake task
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix publish rake task
  Rename rake tasks
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Fix publish rake task
  Fix publish rake task
  Rename rake tasks
Merge branch 'master' into gh-pages

* master: