Add .gitignore.
Merge remote-tracking branch 'origin'
Oops.
Merge branch 'master' of github.com:feketelovag/vim-config