Upgrade to 2.1
Upgrate to latest Rails