Sorting out the plumbing

oooh errr
Merge branch 'master' into profiles

Conflicts:
	GuardianNGW/css/global.css
Merge pull request #103 from mr-mr/profiles

Sorting out the plumbing