adding tests for bcrypt password methods to user model
Merge branch 'master' into uauth
half-finished bcrypt password methods
commenting out work with Torey
Merge branch 'master' into uauth
Merge pull request #12 from bengolden/uauth

Uauth