WIP Upgrade to Ruby 2.1.1 and Rails 4.0.3

2 failing tests
WIP Upgrade to Ruby 2.1.1 and Rails 4.0.3

all tests passing