Get rid of heavy omni complete - seems to hang on some machines
Merge branch 'master' into jby

* master:
  Get rid of heavy omni complete - seems to hang on some machines