adding .gitignore for .vim/.netrwhist
removing .vim/.netrwhist from git cache
lots of changes from kevinm-desktop
committing untracked files
fixing merge conflict
fixing merge conflict