updated vim config
Merge branch 'master' of github.com:mgarcs/dotvim

resolving conflicts