More basics
More boilerplate
Merge branch 'master' of https://github.com/danni/django-reformation

Conflicts:
	reformation/templatetags/reformation.py