First stab at Rails4 upgrade and then some