small updates
Merge branch 'master' of https://github.com/heychris/dotfiles

Conflicts:
	bash/bash_prompt