Fix travis weirdness.
Merge pull request #87 from dcjones/master

Fix travis weirdness.