Tweaks to vagrant provision script...
More refactoring and changes..