Merging changes from origin/expand_environment_functionality....
Merge remote-tracking branch 'origin/config_cleanup_take3' into integration
Switch per-env-configs over to Rakefile-templates, per the style of the times.
Merge remote-tracking branch 'origin/twitter_improvement' into integration
Merge remote-tracking branch 'origin/plugin_helper' into integration

Conflicts:
	Rakefile
Merge remote-tracking branch 'origin/pre_and_post_dated_posts_take2' into integration

Conflicts:
	Rakefile
Merge branch 'disqus_namespacing' into integration
Merge branch 'fix_bad_merge' into integration
Merge branch 'js_fixups_take2' into integration

Conflicts:
	.themes/classic/source/_includes/post/sharing.html
Merge branch 'whitespace_cleanup' into integration

Conflicts:
	.themes/classic/_config/google-plus.yml
Merge branch 'cruft_removal' into integration
Merge branch 'update_clean_and_clobber' into integration
Merge branch 'safer_rsync' into integration
Merge branch 's3cmd_deployment' into integration