Merge
Merge pull request #1331 from darkwing/redesign-sphinx

Update sphinx settings with redesign