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
Specify more explcit Ruby version
Merge remote-tracking branch 'octopress/master'

Conflicts:
	_config.yml