Updated vim config for 7.4
Merge branch 'master' of github.com:daviddavis/dotfiles