Compatibility with custom User models in Django 1.5. Also fixed some code which assumed uploaded files are stored locally, plus other minor fixes.
Fixed broken test, added new test, added more assertions. Tests no longer assume app lives at /simple_import/.
Merge branch 'master' of https://github.com/SeanHayes/django-simple-import

Conflicts:
	simple_import/tests.py
	simple_import/views.py

Fixed test_match_relations test