Cleaned up import and added notification observers for ContentImporter.  Removed all the blocks in the importer. Everything is now synchronous with one completion block at the end!