some more merges from a clean rails 4 app