adding in work that I've been doing
Merge branch 'master' of github.com:philipmac/Ehrenriech_collab_paper