change to exit conditions in proportional approach
slight change to the output of the bayesian method
Merge branch 'master' of https://github.com/mdfortune/colocCommonControl

Conflicts:
	R/coloc.mdf.R