vim: improve autocompletion for python to avoid Rope conflicts
Merge remote-tracking branch 'upstream/master'