Tweaks for PyPi

Testing on PyPi showed problems with the setup and RST files