added method to stop aggregate query threads
fix typo
added test example
Merge branch 'marco'

Conflicts:
	pyretic/core/language.py