Merge pull request #1 from bcassell/master

Fixing broken bits
fixing imports