Use six to keep basestring compat
Bump version number