merge from NBT master
Merge branch 'master' of https://github.com/NeurophysiologicalBiomarkerToolbox/meegpipe into meegpipe
Merge branch 'meegpipe'