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

make clear whats enabled and clean settings