Changes to event listings on index
Merge branch 'master' of https://github.com/lrsjohnson/simmonscpw2013

Conflicts:
	tours/static/tours/js/main.js
	tours/views.py