Update SETUP_BY_USER, Fixed configuration for x86-64-threaded machines
Merge branch 'master' of https://github.com/anaio/LayerCake

Conflicts:
	SETUP_BY_USER