Simplify data importer. Add more error trapping. Closes #60.
Merged.