Add PROMPT_DIRTRIM, and nstterm to bashrc.
Merge branch 'master' of github.com:mundya/dotfiles

Conflicts:
	bash/.bashrc