Update vimrc
Update watchfiles/add watchlit
Merge branch 'master' into osx