misc
Merge branch 'master' of github.com:jrnold/examiner

Conflicts:
	man/examiner_opts.Rd
	vignettes/introduction.Rnw