Disable ido's annoying auto-merging of directories if no match is found
Always auto-skip closing pair
Merge remote-tracking branch 'upstream/master'