Remove merge conflict cruft

Some leftovers from a merge were in the requirements.pip
file, meaning trying to install from the requirements file
would throw an error.
Merge pull request #1 from waylon999/master

Remove merge conflict cruft