Updates for recent ruby versions (removes warnings in 1.9.3 and above) as well as activesupport 3.2+