clean up configuration
Merge pull request #76 from brianium/enhancement/configuration-reader

clean up configuration