Many updates
Merge branch 'master' of https://github.com/mtedwards/Starter

Conflicts:
	functions.php
	lib/clean.php
	lib/foundation.php
	scss/_defaults.scss
	scss/_settings.scss
	scss/_wordpress.scss
	tasks/options/concat.js
	tasks/options/uglify.js