Tests fail, but sites work on rails 4.1 upgrade
Merge branch 'master' into rails_upgrade
All tests passing on rails 4.1.4
More rails 4.1.4 cleanup
Adding missing slug columns
Merge branch 'master' into rails_upgrade