Prefer company to auto-complete, and load customizations for company.
Merge branch 'master' of github.com:pat-thomas/emacs