Use unordered (hash) map tp look up samples
test ini file no longer has samples
Merge branch 'master' into in-memory

Merged hashmap for sample look-up from main
Conflicts (resolved)
	main.cc
No params vector for in-memory branch
SampleMap for vistior now a constant ref
mergred changes form master