std::atomic namespace fix
TSVQ
Merge branch 'master' of https://github.com/cmdevries/LMW-tree

Conflicts:
	src/KMeans.h
	src/TSVQ.h
Merge branch 'master' of https://github.com/cmdevries/LMW-tree
Adding strtk in contribs