$ migration_generator: migration template file name changed and output organized in a more cleaner way
Merge branch 'migration_generator'

Conflicts:
	test/generators/test_migration_generator.rb