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
Ignore protocol relative '//' urls.
Removed accidental call to expand_url
Fixed the expand_url filter. Finally.

Thanks @larryprice
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
Update to later ruby 1.9.3 build in rvm config
Merge remote-tracking branch 'upstream/master' into smt

* upstream/master:
  Use HTTPS for google webfonts when on HTTPS site
  Default to HTTPS for google searches
  gist_plugin: Handle multiple redirects, stopping if we find a circular reference
  Fixed the expand_url filter. Finally.
  Removed accidental call to expand_url
  Ignore protocol relative '//' urls.
  Fix typo in update_style copy command
  Reversed update_style copy direction to correctly restore the sass.old/custom files to the new sass/custom folder

Conflicts:
	_config.yml