fix Grep, enable neocomplete
Merge branch 'master' of github.com:rargo/DotFile
update