Python3 Changes merged in from mysqlclient-python

The py3 connection_arg fixes are my own