Random fixes
Fixed urls.py in py2
Fixed missing literal pref
unicode -> six.text_type where safe
Random
Merge remote-tracking branch 'untitaker/sprint-branch' into sprint-branch
Merge pull request #302 from DasIch/unicode-text-type

unicode -> six.text_type where safe