updated to rails 4.1.2
Changed bcrypt-ruby to bcrypt as the gem has changed name