Cleaning up code
Merge branch 'metrics' of https://github.com/startexploding/webmaker-events into metrics

Conflicts:
	views/events/metrics.html
Merge branch 'metrics' of https://github.com/startexploding/webmaker-events into metrics