Merge pull request #1467 from swryan/gui

doc build fix from Keith, gui test fixes, etc