Upgrade Rails / Bundle update

Not yet to version 4, we first need to be completely up to date before
making the big jump.