Remove shoulds
Update gems for Rails 4.1
Reduce expected errors on password_confirmation

Apparently there was an API change in 4.1?
Extract local variable
Merge branch rails4.1