Getting ready for rails 4.2