Rails 4.1.6 upgrade, and text changes

NOPE - this needs to die