Make the rails-enterprise branch up to date.

Just making everything up to date.