added single-line super prompt
Merge branch 'master' of github.com:fredsmith/dotfiles

Conflicts:
	bash/super-prompt