Another fix
Merge branch 'develop'
Merge branch 'master' of https://github.com/jupl/brunch-toolchain into develop

Conflicts:
	jakelib/module.jake