Add fill-column-indicator pkg and configure company and ediff a bit more