Remove merge conflict in requirements.txt

[YPCrumble]

Fixes #102

[miketwo]

Might want to remove shreddit==... as well. A requirements file shouldn't reference the program itself.

[aknobloch]

This completely removes the decorator and wheel dependencies. I'm not familiar enough with the project to know if those are truly no longer needed, just pointing it out.