Plug category filter into events list screen.
Merge branch 'master' into category_filter_for_events

Conflicts:
	eluminate_web/apps/events/views.py
Merge pull request #86 from jogwen/category_filter_for_events

Merge the category initial filter in. Follow up form another Pull Request