update bash prompt

show:
 * the current git branch (when on a git reposotory)
 * the current branch status (usually ahead/behind/or diverged)
 * the number of jobs

This'll probably need to be updated for edgecases, but it seems to work
in the general cases
don't need to show the branch in `git s` anymore

because it's in my prompt :D
update vim plugins