premerge to pull Nathaniel's commit
Merge branch 'master' of github.com:mnfienen/NETICA_CV_GENERAL