changed vignettes to not build during pkg install, new makefile