Fix tests.
Update Rails.
Merge branch 'master' of github.com:cornelius/iwilltravel