fixed grep functions
Merge branch 'master' of ssh://ssh.github.com:443/s-evans/vimrc