improved vimrc with diff buffer file from disk
Merge branch 'dev' into ly