Fix travis compilation

It took 30 commits, but this fixes #84