Conflicts:
	railties/test/railties/plugin_test.rb

Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.

Signed-off-by: NYehuda Katz <wycats@Yehuda-Katz.local>

Less places you need to change if you rename your application.

Conflicts:
	railties/lib/rails/application.rb