merge final workshop code

Remove spurious print statements, add csv output options, add
standard-deviation based velocity dropping during bin-averaging
Merge remote-tracking branch 'origin/master'

Conflicts:
	adcpy/adcpy.py