Upgrade Rails
Oops, upgrade again
Misc fixes