move tmux.conf, rename mybashrc
add some color to your life
 was not working anyway
merge default bashrc into mine
i3 config
use xterm instead of terminator
Merge branch 'master' of github.com:chpatton013/dotfiles

Conflicts:
	sh/alias.sh