pull rebase to keep changes
py26-virtualenvwrapper mac port
plugins/git: missing compdefs and new aliases