Guard the numpydoc import
merge master
Merge pull request #335 from rmcgibbo/check-numpydoc-import

Guard the numpydoc import