Merge remote-tracking branches 'josh/master', 'dselassi/master' and 'fhats/master'
better? zero detection
changed to timestep return
Merge branch 'master' of git://github.com/mfield/doppler

Conflicts:
	zero_detection.py