add vim jellybeans color scheme
also count merge commits in git prompt