Fix issues with the travis build.

This should fix up the issues you were seeing with the travis build; I'll make a few more comments on the [other ticket](https://github.com/craigcitro/r-travis/issues/112).