Removed detection of config file, style fixes
Merge pull request #3 from rchristensen/master

Overwrite config file as needed, style fixes
Merge pull request #1 from shlomoswidler/master

sync latest upstream