Merge pull request #9 from mastercoin-MSC/master

Sync to master
Fixed Bad password login not timing out
Fixed Bad password login not timing out
Merge pull request #474 from achamely/master

Fixed Bad password login not timing out