incorporate vagrant updates into master repo