added whatson and smarter disable function
hadoop alias conflicted with hadoop command line tool
make mkdir make non-existant parents
default to less crazy prompt
Merge branch 'master' of github.com:fredsmith/dotfiles

Conflicts:
	bash/grid