fix import error and unittest brokenness

this gets `./pants tests/python/twitter/pants:all` passing
again
Merge pull request #116 from ryan-williams/fix-tests

fix import error and unittest brokenness