Travis CI Fixes and Tool Installer stuff, plus a few tweaks