Merge branch 'improved_functional_and_nce' of https://github.com/SEL-Columbia/nmis_R_scripts
Merge branch 'master' of https://github.com/SEL-Columbia/nmis_R_scripts