Updated description and makefile [ci skip]
Merge branch 'master' into devel [ci skip]

Conflicts:
	vignettes/poppr_manual.pdf
	vignettes/poppr_manual.tex