Dry up controllers a little bit
Convert to rails 4.1.1