Do part of catchup to upstream

[eguven]

These changes are not functional but visual to catch up to the upstream to ease maintainability.

I wasn't planning on maintaining this since the upstream linsomniac/python-memcached already has much better py23 support, but I noticed that some still use this package.