More fixes for PyPI; using rst for readme