also test vignette when running tests; use travis-tool.sh run_tests to run tests
Merge branch 'master' into full-test

Conflicts:
	.travis.yml

- resolved: vignette is now always built when running tests
move file to satisfy R CMD build
Merge branch 'master' into full-test
Merge branch 'full-test' into 0.7-rc-full-test