Replaced git-flow with hubflow.
Added default color diff while using git diff.