Stella: Fix python3 unicode bug when hashing user directory name
Merge branch 'master' of https://github.com/stellalie/django-avatar

Conflicts:
	avatar/models.py