make sure bad charset isnt passed to encode
Merge branch 'master' of https://github.com/edcrewe/django-csvimport