Updated .vimrc and .vim
Merge branch 'master' of github.com:natux/My-Vim-Config

I change stuff