travis: refactor, add a clang C++11 build

merged build types 1 and 2