Update some config
Merge branch 'master' of github.com:xfalcons/vimrc