Fix up vagrant and travis after comments from lesaux