Merge branch 'develop'

.travis.yml

gui/slick/interfaces/default/editShow.tmpl

gui/slick/interfaces/default/history.tmpl

lib/trakt/trakt.py

sickbeard/common.py

sickbeard/helpers.py

sickbeard/name_cache.py

sickbeard/postProcessor.py

sickbeard/processTV.py

sickbeard/properFinder.py

sickbeard/providers/generic.py

sickbeard/providers/newznab.py

sickbeard/providers/rarbg.py

sickbeard/providers/torrentday.py

sickbeard/rssfeeds.py

sickbeard/scene_numbering.py

sickbeard/search.py

sickbeard/tv.py

sickbeard/tvcache.py

sickbeard/webserve.py