Cleaning up the __init__.py structure.  Added py33 and py34 to the tox tests.