Fixed links in README.rst and a merge error in setup.py