Start correcting according to CRAN review
Merge branch 'dev' into vignette
Figures now build properly
Merge branch 'vignette' into dev
Update news
Update description
Merge branch 'dev'

Conflicts:
	DESCRIPTION