bcrypt-ruby stable is 3.1
Merge branch '3-2-14' of github.com:bvogel/rails into 3-2-14