Revert "Trying simpler clang + travisci"

This reverts commit e5c317a675e7c783e3e128219e3cfe81e4b01622.