Merge tag 'v2.0' of https://github.com/chr1swallace/coloc

CRAN v2.0
Merge branch 'master' of https://github.com/chr1swallace/coloc