added unneccessary files to .gitignore
re-ran poppr manual
Updated date
fixed conflicts when merging

Merge branch 'master' into devel

Conflicts:
	DESCRIPTION
	vignettes/poppr_manual.pdf
	vignettes/poppr_manual.toc
rebuilt manual