Import fixes for Python 3.x.
Merge pull request #2 from stevendborrelli/master

Import fixes for python 3.x