Backport some Travis fixes from point-context

@hobu did some work in point-context, ending with 1d863bc44a86e558f457a94f2d6f908588c78a9e, to fix some breaks in our Travis build. This patch is a backport of this fixes.