bugfix and made vagrant usage optional