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

Conflicts:
	.themes/classic/source/_includes/custom/head.html
	_config.yml