Initial Sphinx commit
Merge pull request #1 from ckuehl/base_updates

Initial Sphinx commit