Upgrade to 2.1
More fixes for 2.1 and Rails 4

Mainly with strong_parameters