Upgrade to Rails 4
Merge branch 'rails4'