upgrade to rails 4.1.0 and fix the 2 small bugs it exposed