Version bump
Removed generated files
Merge branch 'master' into reverted

Conflicts:
	lib/config.js
	lib/fubu-import.js
	lib/index.js
	lib/scaffolding.js
	lib/util.js