buf can be False for some reason...
don't die on vim commands
Merge branch 'master' into highlight_bug_fixes
Merge master. Fix conflicts