Initial merge of sickbeard-tanime project (which was setup incorrectly in git)