adding .vagrant to gitignore
killed .vagrant file
merging