Increased robustness by using intel license file import just when compiling for intel
Merge branch 'master' of https://github.com/tsunamiSim/SWE

Conflicts:
	SConstruct