Use std::atomic for hash_
Merge branch 'master' into hash_thread

Conflicts:
	src/basic.h
Merge pull request #225 from certik/hash_thread

Use std::atomic for hash_