Merged latest Pistachitos into IsoHunt
Merge branch 'IsoHunt' of github.com:harley0/Sick-Beard into IsoHunt; fixed previous unresolved conflicts

Conflicts:
	sickbeard/__init__.py