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