ready for merge
Merge branch 'master' into hilary-beta

Conflicts:
	config.codekit
updates codekit config

and removes unnecessary minification
Merge branch 'hilary-beta'