new parameter for the resample factor
adjust for SDFromMua
intermediate merge
bob merge
Default number of PCA features
Merge branch 'master' of git://github.com/pmeier82/BOTMpy
Default number of PCA features