Update plugins and vimrc
Merge branch 'master' of github.com:qstrahl/.vim
Update plugins