Spike padding defaults
Merge branch 'master' of github.com:djoshea/trial-data