Add node modules to ignore in vimrc
Merge conflict
Fix typo in tpope's name, oops