correct thread error (str) -> (str,> (tuples!)
Merge branch 'master' of github.com:ottodietz/qdsearch

Conflicts:
	qdsearch.py
	views/spectrometer.py
remove pdb from source