Merge branch 'master' of https://github.com/billbrod/fMRI-MVPA