upgrade from Rails 3 > 4

Cleaned up some stuff. Migration now works, but work is needed to make
it all Rails 4 compliant.