make the User model ready for Django 1.5
fix tests
fix deprecation warnings