Fix for #315, backport xbmc always on option

fix deleted line
Merge pull request #471 from pmaciocia/xbmc_always_on_315

backport: xbmc always on option - fix #315
Update search_queue.py
Merge pull request #484 from krazykrazz/dev

Update search_queue.py
Moved changes to dev
Merge pull request #487 from mythern/dev

Workaround for #336
Merge remote-tracking branch 'echel0n/dev' into patch-1