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 into source

Conflicts:
	_config.yml
Merge branch 'source' of https://github.com/happybit/happybit.github.io into source
newarch re-allocation