Fix Travis!

Closes #681. I didn't really feel like trying to squash. This also implements #680, largely due to me miscounting SHA1s.
@berkerpeksag I had to pick between putting the magic crap in the Makefile or .travis.yml. Since the Makefile already had testing code, and I had to set Make's environment variables, it was just easier to do it there. That is, when I actually remembered to put tabs instead of four stupid spaces.