fix vignette
Merge branch 'trunk'
Merge branch 'master' of github.com:RGLab/openCyto