Merge pull request #525 from haswalt/master

Use renamed gem for bcrypt