Changes for my mac
Update to use company-mode for autocomplete