Updating to Vagrant2, tweaks to provision script to sort out the mecurial trust issue, configure esl better