write machine and cache data. in config.hpp.cmake added line to fix problems on windows with min and max
Merge branch 'master' of https://github.com/psastras/vocabtree

Conflicts:
	modules/bench/bench_final.cxx