Work around a parse error in Django 1.4 for recent GEOS versions
Fix some flake8 violations
Simplified tox/travis setup
Merge branch 'master' of github.com:brutasse/django-floppyforms

Conflicts:
	.travis.yml
	tox.ini