new model fits for rb-up analysis per heather's comments
merge?

Merge branch 'master' of https://github.com/erollinson/Dissertation

Conflicts:
	intensiveanalysisrevision.R
Merge branch 'master' of https://github.com/erollinson/Dissertation