adding merges
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

Conflicts:
	_config.yml