Various updates, completing change to company-mode, and so on.