edit
Merge branch 'master' into mikes-paper-edits

Conflicts:
	Compare_053014_statsmed_revisions.tex