unicode -> six.text_type where safe
Merge pull request #302 from DasIch/unicode-text-type

unicode -> six.text_type where safe