Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Fix typo in update_style copy command
gist_plugin: Handle multiple redirects, stopping if we find a circular reference
Merge pull request #1506 from duckpuppy/handle-multiple-redirects

gist_plugin: Handle multiple redirects, stopping if we find a circular r...
Default to HTTPS for google searches
Use HTTPS for google webfonts when on HTTPS site
Merge pull request #1515 from rythie/master

A couple of changes to make octopress more friendly when hosted using HTTPS
Merge pull request #1489 from duckpuppy/fix-update_style

Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder
Merge branch 'master' of git://github.com/imathis/octopress into source

Conflicts:
	_config.yml
Revert "some kind of style fixes; honestly, I don't remember"

This reverts commit e6063ecafcf2379a3c1a50b73674cfbd16f49505.