Copied over latest changes from affiliated package template
Ensure that optional dependencies for Sphinx are installed
Merge pull request #25 from astrofrog/update-from-template-3

Copied over latest changes from affiliated package template