Company should stay out of the way
Merge branch 'master' of github.com:theldoria/.emacs.d