vimrc, .emacs
Merge branch 'master' of https://github.com/nbhd/settings