Add coloring to the gitconfig and a few changes in vim