Revert "Merge git://github.com/mr-orange/Sick-Beard into development"

This reverts commit d66d512e277164374c922c2a6dedab5116f165f1, reversing
changes made to 0b07b482e08204ad54cb9fdee67e77a091ebd431.