Add clang again, but install gcc-4.7 just for the libstd++