Use six.text_type instead of unicode

`unicode` is Python 2 only.

Also, please merge `with_unique_with` to master.