updated cider, switched to company-mode