Merge pull request #3 from martensm/master

Clean up imports and repo.