adding gitignore and both boxes to Vagrantfile
merge origin
adding salt and fix override