Update vimrc and gitignore

Related Github issues
None

Working branch
master