Sphinx

Since there is no need for a separate branch to test numpy dosctring convention, this branch can be pulled into master.