.bashrc: add bash profile
.bashrc: using christoph's changes on prompt
Merge branch 'master' of https://github.com/darvain/dotfiles

Conflicts:
	.bashrc