Merge branch 'master' into guff
JAABAPlot: better input parsing for ExperimentBatch
Merge branch 'guff' of https://github.com/kristinbranson/JAABA into guff
JAABAPlot should be compatible with guff now
JAABAPlot: 'valid' instead of 'same' on convolutions for time series
JAABAPlot: fixed small cull_short_trajectory bug in InterestingFeatureHistograms
JAABAPlot: turned matlabpool back on at startup
JAABAPlot: males vs females in legends now
JAABAPlot: bout stats now does male vs. female, and has legends
Merge branch 'guff' of https://github.com/kristinbranson/JAABA into guff
JAABAPlot: will now ask if it can't find registered_trx.mat
JAABAPlot: will now ask if it can't find perframe/
Merge branch 'guff' of https://github.com/kristinbranson/JAABA into guff