need these now, I guess
removing "" at tail of BOOST_ROOT (causing problems?)

Conflicts:
	CMakeLists.txt
and the : causes problems here, too
Merge remote-tracking branch 'upstream/master' into ldpc_tracie

Trying to resolve a merge error. This matches nick's upstream CMakeLists.txt which he updated a few weeks ago to resolve some issues Manu was having.

Conflicts:
	CMakeLists.txt