Extending timeouts to fix #10
Merge branch 'give-thanks' of github.com:zbanks/musicazoo into give-thanks

Conflicts:
	musicazoo/queue/module.py