Fixed default callback for sails-generate
Merge branch 'generators' of https://github.com/balderdashy/sails into generators

Conflicts:
	bin/sails-generate.js