Initial changes for Rail 4.0
Rolling back the bad Rails 4 checkin
Commiting the Rails 4 changes, but this time on the right branch