add vagrant to ignore list
resolved conflict in gitignore with vagrant