Now uses twisted and added functionality for android search. Needs to be cleaned up.
qMerge branch 'master' of https://github.com/johncosker/grooveproject

Conflicts:
	waveAPI/apps/py/.vlc_control.py.swp