Work-around for Travis CI build matrix when permuting python versions and
compiler versions.  Without this fix, the clang builds don't actually use clang
Merge pull request #395 from oxtopus/travis-build_matrix-workaround

Work-around for Travis CI build matrix
Merge branch 'master' into c++11-clang-modernizer-lite