Merge branch 'master' of github.com:django-recurrence/django-recurrence

Conflicts:
	README.md