Improved support on older vim versions
Merge branch 'master' of https://github.com/agoconcept/dotfiles