added some tests, fixed a small bug

Conflicts:
	simple_email_confirmation/models.py
	simple_email_confirmation/tests.py
Using assertRaises as a context manager
Merge branch 'throw-correct-error' into develop