deferredQuery now has a parameterizable callback
Merge branch 'master' of https://github.com/ramatevish/capoeira

Conflicts:
	capoeira.py
	lastfm.py