Automatically detect number of threads for build
Merge branch 'master' of github.com:msoos/cryptominisat

Conflicts:
	scripts/aws/client.py
Updating script to use the correct number of threads
Merge branch 'temporary'