gist_plugin: Handle multiple redirects, stopping if we find a circular reference
updating rvm and gist posts
Merge pull request #1506 from duckpuppy/handle-multiple-redirects

gist_plugin: Handle multiple redirects, stopping if we find a circular r...
source for fords on fourth
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 https://github.com/imathis/octopress

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

Conflicts:
_config.yml
Updates
updating
no
removing master, not sure what this is from
Merge branch 'master' of github.com:stepquick/octopress

* 'master' of github.com:stepquick/octopress:
  Updates
  Merge branch 'master' of https://github.com/imathis/octopress
  Use HTTPS for google webfonts when on HTTPS site
  Default to HTTPS for google searches
  source for fords on fourth
  gist_plugin: Handle multiple redirects, stopping if we find a circular reference
merge