MISC: spike sorting
Merge branch 'master' of dicarlo2:repo/array
Merge branch 'master' of ssh://gh/hahong/array_proj