fix git-flow issue. and added coloring to scm status