also test vignette when running tests; use travis-tool.sh run_tests to run tests
move file to satisfy R CMD build
Merge branch 'master' into 0.7-rc