Rails upgrade

Now with passing specs.