Merge branch 'cf'
add Erin's info to author list
Delfino-Mix issue fixed
other minor changes
Merge branch 'master' into cf
Merge branch 'master' of https://github.com/aeckert2/foxtail_linkage into ae
Merge branch 'ae' into cf