Edge Rails applications doesn't need to use arel master

Conflicts:
	railties/lib/rails/generators/app_base.rb
Fix build with bundler 1.6