Proper Bash prompt Theme
Remove Terminal Theme Stuff
Merge branch 'master' of github.com:vanev/dotfiles

Conflicts:
	.bash_prompt