Fix for ticket #2401, changed config options

Removed some older config options. maybe that aren't needed.
Added config option to check for config in current directory first.
Fix for ticket #2401.