updated everything
more updates
Merge branch 'master' of https://github.com/theory14/dotfiles

Conflicts:
	conf/bash_prompt.sh
	conf/color_ls.sh
	conf/term_title.sh