Implement upcoming_events template tag
Merge branch 'master' of github.com:torchbox/verdant-rca