UnicodeEncodeError fixed
Merge branch 'master' of git://github.com/gregplaysguitar/django-trolley