Get rid of heavy omni complete - seems to hang on some machines
revert comment plugin
update gitconfig
map for q and w
Merge remote-tracking branch 'skwp/master'

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