Add py3k branch to testing.
Fix import.
Merge branch 'master' into py3k