Accepts G+ username instead of full URL, adds Google authorship as per https://support.google.com/webmasters/answer/1408986?expand=option2
Site.owner.avatar now accepts local images and hotlinked images (conditional on http://, https:// in string)
Revert google change
Make Google+ expect handle not full url
Resolve conflicts
Resolve conflicts