Improve vagrant bootstrap