Use six instead of embedded code copy

We're holding this as delta in Ubuntu packaging to keep our security team happy - it would be nice to drop it!