Continue last import
Add tracking to user imports
Merge branch 'dev-continue_import' of https://github.com/jcollings/JC-Importer into dev