Upgrade to Rails 4 + other improvements