Throw away conflicting basals events from multiple pumps

Stop trying to be smart...
Merge pull request #109 from tidepool-org/cheddar/fix-multiple-pumps

Throw away conflicting basals events from multiple pumps