Remove clang from travis
Merge branch 'master' into coverity_scan

Conflicts:
	.travis.yml