vimrc: update
Merge branch 'master' of github.com:LehmRob/dotfiles
vimrc: Change status line