Update .bashrc .bash_prompt
Merge branch 'master' of git://github.com/iguto/dotfiles

Conflicts:
	.bashrc