Revert vim underscore word separation
Merge remote-tracking branch 'origin/master'