Small changes
Merge branch 'wip' of github.com:ldotlopez/zizi into wip

Conflicts:
	externals/torrent-spider/analizers/spanish_tracker.py
	externals/torrent-spider/spider.py
Fix merge