updates
Merge branch 'master' of https://github.com/humphrey/django_formrenderer

Conflicts:
	README.md