Spike sorting merging with dev

[juliencarponcy]

This is to solve conflicts between dev and spike_sorting branch before re-branching out again to work on fusion of photometry and spikes data.

Will allow notably better integration of work to be done on:

• triggering at different task point
• selecting different trial types

[juliencarponcy]

I solved the conflicts manually from github. Anyone could give it a quick try? @teristam @kouichi-c-nakamura ?

[juliencarponcy]

Tried to fix most of the slight mistakes of merging by creating another branch spike_sorting_fix prior manual merging.

merge from dev on that branch then taking latest changes from spike_sorting back into it.

Then I pulled that fixed branch into spike_sorting: https://github.com/juliencarponcy/trialexp/pull/40

I re-added the trial_window column that I did not integrate and also put the other variant of the dual_all_reward task that i integrated in a previous commit.

Also changed the rule names for all and final in spikesort.smk

Let me know @teristam if you still see major issues. All the feedback very much appreciated. I'll try to take all the advices