Simplify CSS setup, everything is in global.min.css, loaded through a link in the head
Removed rel=canonical tags from theguardian.com domain.

Editionalised pages now get...

<link rel="alternate" hreflang="..." href="..." />
Merge branch 'master' of github.com:guardian/frontend into dotcom
Removed rel=canonical tags from theguardian.com domain.

Editionalised pages now get...

<link rel="alternate" hreflang="..." href="..." />
Merge branch 'master' of github.com:guardian/frontend into css-head

Conflicts:
	common/app/assets/stylesheets/global.scss
Merge branch 'master' of github.com:guardian/frontend into css-head
Social buttons don't take the entire width of the container
Discussion tabs have the right height in IE9
Merge branch 'master' of github.com:guardian/frontend into css-head
Merge branch 'master' of github.com:guardian/frontend into dotcom
Merge pull request #1069 from guardian/css-head

Simplify CSS setup, everything is in global.min.css, loaded through a link in the head
Stop edition urls leaking into m.guardian.co.uk
Merge pull request #1081 from guardian/dotcom

Editionalised pages meta data
Merge branch 'master' into local-nav

Conflicts:
	common/app/assets/stylesheets/global.scss