Merge pull request #266 from jeremyschulman/master

sphinxdocs, more on SW