Updated Vagrant + butter

Updated vagrant installation and butter to follow master