Pass at being smarter about a conda import error

Fixes #30
Merge branch 'fix/import-errors' (v1.2.1)