belated commit of experiments with occurrences
clean up removed files
fixed issue with start_date not matching start_time in calendar rendering
Merge branch 'master' of https://github.com/silvabox/flaming-archer into nathancolgate/4998196

Conflicts:
	.gitignore
merged from nathancolgate/4998196 to master