fix detection for CXX=clang
travis: for now, clang build result should not impact overall build result
hopefully this gives us just two travis builds (not 4)
Merge remote-tracking branch 'origin/develop' into feature/ce-gui

Conflicts:
	.travis.yml