Various changes (interupted by EQ)
Merge branch 'master' of https://github.com/nicholasjgreen/wip

Conflicts:
	cms/sites/all/themes/wip/sass/main.scss