Merge branch 'release/0.1.3'
Merge branch 'release/0.2.0'
Merge branch 'release/0.2.1'
Bug fixes
Fixed several bugs in the signup, login, and password reset modules
Updated password reset module so that it is more sane
Merge branch 'release/3.0'
Merge branch 'develop'
more test fixes
test fixes
test fixes
Merge branch 'develop'
bug fixes
test fixes