* mad scaling start
Merge branch 'master' into mad_scaling

Conflicts:
	botmpy/nodes/spike_sorting.py
mteo will not set filter output to 0.0 for k-values that cannot be filtered (data.size < 4k+1)