created GetDistCpp1.py which is the same as GetDistCpp.py except it uses vectors rather than hash tables, added code to make the snap module in client.py optional
Merge remote branch 'upstream/master'

Conflicts:
	python/client.py
Rename