vim conf added
Merge branch 'master' of https://github.com/ptrsd/config