Upgrade to activesupport and activemodel 4.0.x