Drop support for PY2.6, Get all test but one to pass on PY3K.