Refactored data importer in preparation of field importer
Implemented field importer
Removed debugging statements and improved text on screens
Merge branch 'field_importer'