merge diff. install colordiff on travis