Updated man pages, vignette; passing tests...good to go for master merge