.vimrc
Merge branch 'master' of github.com:dotintegral/conf