Updates to scons build.
Updates to  scons.
Updates to scons build.
Merge branch 'jz_clang' into jz_three

Conflicts:
	SConstruct.py