Master commit for vagrant on laptop.