Merge branch 'cf'
Merge branch 'cf'
Merge branch 'cf'
Merge branch 'cf'
Merge branch 'cf'
changes to text and Figure 2
update headings and size on snp go venn figure
Merge remote-tracking branch 'ae/master' into ae
Merge branch 'ae' into cf

Conflicts:
	foxtail_linkage.tex
manual fix of merge conflicts