upgrade to rails 4.1
rails 4 compatibility updates for merged code
Merge branch 'enhancements'