Remove some unneeded company config
Increase a bit the idle delay
Merge branch 'master' of github.com:bbatsov/prelude
reduced tabs in web mode
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Increase a bit the idle delay
  Remove some unneeded company config