Streamline setup.py and Sphinx - fixed numpydoc bug
Merge pull request #24 from blink1073/dev

More release prep