Speeding up build times travis

You also need to rebase onto master, I changed this file a bunch