Remove the imports from __init__ as they are not needed and will make setup.py fail if six is not installed.

Signed-off-by: David Black <dblack@atlassian.com>
Merge branch 'python_3_support' into minor_code_fixup