Fixed setup.py file

plugin makedist messes up the setup.py file. A couple other minor fixes in the docs as well.