Merge pull request #351 from bhariharan/unstable

Calling it 2.1.0.unstable
Passcode bug fixes
Fix for logout not cleaning up DB
Bump up version number
Merge pull request #357 from bhariharan/master

Bug fixes for 2.0.1
Merge branch 'master' into unstable