Fixes for sphinx (not done yet)
Sphinx setup files
More fixes to sphinx.  Moved some functions to private