Replacing auto-complete with company mode, and fixing a few stray shortcuts