Modified the Google Oauth2 class for updated scopes and user info API call as described here http://www.riskcompletefailure.com/2014/03/migrating-away-from-userinfo.html
Modified the Google Oauth2 class for updated scopes and user info API call as described here http://www.riskcompletefailure.com/2014/03/migrating-away-from-userinfo.html
Merge branch 'master' of https://github.com/justingrayston/authomatic
Merge branch 'master' into jg

Conflicts:
	authomatic/providers/oauth2.py
Fixed a bug with encoding utf-8 strings in templates.
Fixed error in rendering of human readable content

caused by single quote occurences in the content.