rails 4
more rails 4 cleanup
Gemfile.lock update