Fixed config
Removed sass-cache
Merge branch 'master' of https://github.com/ericmcdaniel/jQT-boilerplate

Conflicts:
	www/config.xml