Fixing travis

@krainboltgreene I fixed the tests in this branch. If you want to merge this in, rebase to master on your branch, we can see if everything passes.