merge
Merge branch 'master' of https://github.com/afloren/neurometrics-paper
modified several figures per Risto's edits.