Merge pull request #245 from smartchicago/topic/styling

Topic/styling
Remove merge conflict in code
Merge pull request #246 from notthatbreezy/topic/location-fix

Topic/location fix
Add common.debounce, minor cleanup
Make map/list update nb/locations
Remove git garbage
Merge pull request #247 from bhuber/topic/filter-updates

Topic/filter updates
Merge upstream/staging