Change 'b' alias to just show local branches. Add new 'bra' alias for all
Change EDITOR to vi