config file parsing will now ignore options that apply to other modes of rethinkdb
added warning in must specify one of --directory or --file to import when unexpected files are found in the import directory
Merge branch 'next' into sam_939_alt