make the select menu reflect what city events are being filtered by
add test for city filter
Merge branch 'master' into refactor_city_filter

Merging master to make sure it plays well
Merge pull request #5 from epicodus/refactor_city_filter

Refactor city filter