Fix #302
Add missing entries in example configuration files
Fix error type on bad configuration
addressing local comments
Merge pull request #305 from antgonza/issue_302

Fix #302
pep8/flake8 fixes
Merge pull request #307 from adamrp/various_little_fixes

Various little fixes