Initial work on recurring events
Merge branch 'recurring-events' into deploy

Conflicts:
	setup.py