merging upstream/master
fixing merge conflicts
fixing mistake I made
Testing bcrypt with passport
Merge pull request #100 from jasonalmaturner/master

Testing bcrypt with passport