updated vim conf + (plugins)
Merge branch 'master' of https://github.com/hypnotortoise/myconf