Signed-off-by: NJosé Valim <jose.valim@gmail.com>

In the event a migration already exists with that number, the new migration's timestamp will be incremented by 1.

[#4412 state:resolved]
Signed-off-by: NMichael Koziarski <michael@koziarski.com>

Load generators from both lib/rails/generators and lib/generators. Using the former since it's less obstrusive.

Generators load path now will be Ruby load path. If you want to use rspec:install generator, you need generators/rspec/install_generator in your load path.

This reverts commit a288b74f.

Signed-off-by: NYehuda Katz <wycats@gmail.com>