First pass at support for initial import
Add a test for the initial import functionality
Merge pull request #141 from benmccann/initial-import

First pass at support for initial import