Make sure __unicode__ methods return unicode
Merge pull request #309 from keto/unicode-fixes

Make sure __unicode__ methods return unicode