.gitignore: Ignoring virtualenv directories
Installing django_otp fork before testing

Using 'dependency_links' might be interesting,
but https://caremad.io/blog/setup-vs-requirement/
Merge branch 'master' into topic/using_django_otp_fork
django_otp.handlers.login is not exposed as django_otp.login

(At least in my fork)
Preparing tests using mongoengine
PERSISTENCE_STRATEGY 'django_db' created.
PERSISTENCE_STRATEGY 'mongoengine_db' created.
Making tests work with mongoengine
Big hack for compatibility with django generic views. All tests passing @python2
All tests usingo mongodb passing for django>=1.5,<1.7, python2 and 3
Updating .gitignore
Adding environments for testing with mongodb and django1.7. Tests failing
No longer specifying the expected django_otp version in setup.py
Hiding "phone numbers" section in profile if no phone methods are available
Not using related manager to get user's staticdevice anymore

It does not exist in mongoengine
Otp is now required before disabling otp
Merge branch 'feature/mongoengine_support'

Conflicts:
	tests/tests.py
	two_factor/utils.py
PhoneDevice.verify_token now casts the token to an int

If the field used to input the token is a CharField, the token
value will be a string, and  PhoneDevice.verify_token  will always fail.

Casting the token to an int during the verification in order to
avoid this problem. This is the same approach taken by django_otp.