Fix import-data to work with single xlsx file.
Merge branch 'master' into edwFile
Remove junk