Updates to vagrant bootstrap and arcli code