YOU WILL NOT IGNORE MY GITIGNORE, GIT
Merge branch 'dev-core-temp' into dev-core-xml

Conflicts:
	core-modulez/consumer.js
	core-modulez/defaults.js
	core-modulez/output.js
	core-modulez/params.js
	core-modulez/spec.js
	core-modulez/template.js
	core-modulez/types.js
	main.js
This:
git rm -r --cached .
git add .
git commit -m "fixing .gitignore"
(http://www.randallkent.com/development/gitignore-not-working)