Merge points by time/loc instead of clobbering, fixes #20
Merge branch 'master' into multi_sensor_fix
Merge pull request #24 from asascience-open/multi_sensor_fix

Multi sensor fix