Fixing issues with spike filtering and timing
Merge branch 'popTrajSet' of github.com:djoshea/trial-data into popTrajSet