Changing vegan to imports and fixing namespace
fixed conflicts.

Merge branch 'master' into devel

Conflicts:
	vignettes/poppr_manual-115.pdf
	vignettes/poppr_manual.log
	vignettes/poppr_manual.pdf
	vignettes/poppr_manual.synctex.gz
	vignettes/poppr_manual.toc