Merging with Peter's fixes
Merge branch 'master' of git://github.com/chinasaur/CBPSpikesortDemo

Conflicts:
	spikesort_demo/cbp_spikesort_demo_script.m
	spikesort_demo/preproc/EstimateInitialWaveforms.m
Merge branch 'master' of git://github.com/chinasaur/CBPSpikesortDemo

Conflicts:
	spikesort_demo/cbp_spikesort_demo_script.m
	spikesort_demo/load_default_parameters.m
	spikesort_demo/preproc/EstimateInitialWaveforms.m