Moved from auto-complete to company-mode, few tweaks