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
Fixed the expand_url filter. Finally.

Thanks @larryprice
Merge branch 'master' of git://github.com/imathis/octopress

* 'master' of git://github.com/imathis/octopress:
  Fixed the expand_url filter. Finally.
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 branch 'master' of git://github.com/imathis/octopress

https instead of http.

* 'master' of git://github.com/imathis/octopress:
  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

Conflicts:
	_config.yml
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
Use correct time in log message for Github deploy
Merge pull request #1563 from tsmacdonald/master

Use correct time in log message for Github deploy
Update gist tag url to githubusercontent.com
fix script_url_for url bug
Merge pull request #1567 from howiehu/fix-gist-url-bug

Update gist tag url to githubusercontent.com
Merge branch 'master' of git://github.com/imathis/octopress

* 'master' of git://github.com/imathis/octopress:
  fix script_url_for url bug
  Update gist tag url to githubusercontent.com
  Use correct time in log message for Github deploy
  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
Update Ruby version.
Node
PittJUG