Re-did config file path handling, removed directory-push/directory-pop for syle more consistent with old behavior