bash improvments
Merge branch 'master' of github.com:lanrat/dotfiles

Conflicts:
	shell/bashrc