Fixed missing import and unreachable NotImplementedError
Mostly fixing whitespace and stray semicolons
Merge pull request #10 from jasonmyers/master

Fixed missing import and unreachable NotImplementedError