Add support for more complex git branch names; Use symbolic icons for git status in vim