Merge remote-tracking branch 'origin/develop' into develop

readme.md

@@ -3,16 +3,13 @@ SickRage
 Video File Manager for TV Shows, It watches for new episodes of your favorite shows and when they are posted it does its magic.
 
 ## Branch Build Status
- - DEVELOP<br>
 [![Build Status](https://travis-ci.org/SiCKRAGETV/SickRage.svg?branch=develop)](https://travis-ci.org/SiCKRAGETV/SickRage)
- - MASTER<br>
-[![Build Status](https://travis-ci.org/SiCKRAGETV/SickRage.svg?branch=master)](https://travis-ci.org/SiCKRAGETV/SickRage)
 
 ## Features
- - KODI library updates, poster/fanart downloads, and NFO/TBN generation
+ - XBMC library updates, poster/fanart downloads, and NFO/TBN generation
  - configurable episode renaming
  - available for any platform, uses simple HTTP interface
- - can notify KODI, Growl, or Twitter when new episodes are available
+ - can notify XBMC, Growl, or Twitter when new episodes are available
  - specials and double episode support
  - Automatic XEM Scene Numbering/Naming for seasons/episodes
  - Episode Status Manager now allows for mass failing seasons/episodes to force retrying.
@@ -24,10 +21,6 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh
  - Your tvshow.nfo files are now tagged with a indexer key so that SickBeard can easily tell if the shows info comes from TheTVDB or TVRage.
  - Sports shows are now able to be searched for..
 
-## Screenshots
-[Desktop (Full-HD)](http://imgur.com/a/4fpBk)<br>
-[Mobile](http://imgur.com/a/WPyG6)
-
 ## Dependencies
  To run SickRage from source you will need Python 2.6+ and Cheetah 2.1.0+.
 
@@ -35,14 +28,7 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh
  Any questions or setup info your looking for can be found at out forums https://www.sickrage.tv
 
 ## Bug/Issues
-With your bug reports, specify:
- - Branch
- - Commit hash
- - Your operating system and python version
- - What you did
- - What happened
- - What you expected
- - Link to logfile on http://www.pastebin.com
+[SickRage Issue Tracker](https://github.com/SiCKRAGETV/sickrage-issues)
 
 ## Important
 Please before using this with your existing database (sickbeard.db) please make a backup copy of it and delete any other database files such as cache.db and failed.db if present, we HIGHLY recommend starting out with no database files at all to make this a fresh start but the choice is at your own risk

sickbeard/providers/kat.py

@@ -62,6 +62,7 @@ class KATProvider(generic.TorrentProvider):
         self.cache = KATCache(self)
 
         self.urls = ['http://kickass.so/', 'http://katproxy.com/', 'http://www.kickass.to/']
+        self.url = self.urls[0]        
 
     def isEnabled(self):
         return self.enabled