add bcrypt to settings.php on setup
Merge branch 'bcrypt'