Moved social media links into _config.yml
Removed google_author
Changed email link into proper markdown syntax
Updated google_author tag
Resolved conflict