Switch to company-mode was premature. Run both for now.
Add back some missing configs for ropemacs

Signed-off-by: Konrad Scherer <Konrad.Scherer@windriver.com>