Refactor bash_profile to bashrc and bash_prompt
Merge branch 'master' of github.com:mfandrade/dotfiles

Conflicts:
	.bash_prompt