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

Initial Sphinx commit