Move files to master from gh-pages
Update rake tasks so they can run from any branch.
Merge branch 'master' into gh-pages

* master:
  Update rake tasks so they can run from any branch.
  Move files to master from gh-pages

Conflicts:
	lib/tasks/copy.rake
	lib/tasks/publish.rake
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

* upstream/gh-pages:
  Update rake tasks so they can run from any branch.
  Move files to master from gh-pages