Fixed bin to use the sails-generate generator.
Merge branch 'master' of https://github.com/balderdashy/sails-generate-generator

Conflicts:
	bin/index.js