Added twilio factory
Merge branch 'master' of github.com:jneight/django-mail-factory-extras

Conflicts:
	mailfactory_extras/django_xadmin/adminx.py
Removed unused formview
added to pypi!