- Fixed merge remnants in .vimrc
- Removed remnant backup file still in repo, which was ignored in .gitignore