added ConfigParser and sane defaults
Merge branch 'config'