Merge in all current libmemcached work, plus restore older, working,