Upgrade Rails to 4.1 and disable Amistad until further notice
Merge branch 'feature/upgrade-to-41'
Rails 4.1