updated generator

Conflicts:
	.travis.yml
	lib/generators/enju_leaf/setup/setup_generator.rb