config re-worked
Merge pull request #5 from bradenbest/newconfig

config re-worked. Fixes #2.