Lots and lots of changes. I'll document them later.
Merge branch 'master' of https://github.com/diegovilar/grunt-ppem

Conflicts:
	.idea/.name
	.idea/jsLibraryMappings.xml
	.idea/modules.xml
	package.json
	tasks/preprocessor.js