Fixup bash and vagrant branches