Add missing entries in example configuration files
Fix error type on bad configuration
pep8/flake8 fixes
Merge pull request #307 from adamrp/various_little_fixes

Various little fixes