Fixed filtering of sparks. Previously we weren't properly accounting for time and location
Fixed the same thing for single location method
Merge branch 'master' of github.com:bayleefeore/final_project