Fix up tests.
Upgrade rails.
Merge pull request #30 from square/rails-upgrade

Rails upgrade