Cleaning up queries.
Merge branch 'master' of https://github.com/jcgood/complexity

Conflicts:
	calculateComplexities.py