removed extraneous imports and tokens
removed unused reserved keywords in sort
Merge pull request #53 from salspaugh/warning-cleanup

Warning cleanup