Merge branch 'pair_ia'
Changed url for poppr repository [ci skip]
fixed little booboo in travis url [ci skip]
Merge branch 'master' into devel

Conflicts:
	vignettes/poppr_manual.pdf