cleaner re-use of vagrant boxes, review comment fixes