Fixed general control flow of fit()
Fixed typo
Changed interface to estimateSpikes

now using priors as input, not spike matrix
Implemented merging of templates
Couple of bug fixes related to previous commit
Changed default params for pruning
updated init script
Layout: function to test if channels are neighbors