use mocks by default and clean up settings
Merge pull request #235 from andymckay/clean-up

make clear whats enabled and clean settings
Clear was locked on verify PIN and reset (bug 1003218)
Merge pull request #259 from mstriemer/clear-was-locked-on-verify-1003218

Clear was locked on verify 1003218
ensure settings correct for boku tests