[vimrc] tell vim not creating backup/undo files (but keep swap files)
Merge branch 'vimrc'
Merge branch 'master' into develop