Added __unicode__(verbose)
Added test__unicode__()
Manually fixed conflict
Changed test to work with us, since we no longer use formencode, PEP8 fix