Merge branch 'master' of git://github.com/pymander/bashtools

Conflicts:

	dirstack.sh
Add the git branch to your bash prompt.

This is really handy.
Add git branch to xterm prompt

That is, if it's needed.
Merge branch 'master' of http://ides.leisurenouveau.com/~pymander/bashtools

Conflicts:

	gitprompt.sh
Merge branch 'master' of git+ssh://ln/home/pymander/public_html/bashtools
Merge branch 'master' of git+ssh://ttdev/home/erik/.bash
PV helper functions

This provides the functions 'cpv' and 'mpv', which try to emulate cp
and mv, but using the pv command to show a progress bar. They're
basically best for very large single files.