Better event list

1 function, less code replication, using lots of dictionaries for
switching.
Merge branch 'master' of https://github.com/bethlakshmi/GBE2

Conflicts:
	expo/scheduler/views.py