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/master'

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

* master:
  Update jekyll files from this fiddle
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:
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix publish rake task
  Rename rake tasks
  Update jekyll files from this fiddle
  Update rake tasks so they can run from any branch.
  Move files to master from gh-pages

Conflicts:
	_config.yml
	_data/demo.yml
	_includes/demo.css
	_includes/demo.html
	lib/tasks/copy.rake
	lib/tasks/publish.rake
Merge branch 'master' into gh-pages

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

* upstream/gh-pages:
  Fix publish rake task

Conflicts:
	_config.yml