bad tmux changes...
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	tmux.conf
Added new stuff, looks like some old stuff stayed
Removed that stuff
Merge branch 'master' of github.com:JustinHop/Profile
Removed external aweosme config
tmux stuff, imapfilter cleanup
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	zshrc
Sloppy uncommited changes
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	roxterm.sourceforge.net/Profiles/Justin
	xinitrc-tuxbox1
setting background
tuxbox commitx
Merge branch 'master' of github.com:JustinHop/Profile

Conflicts:
	awesome/rc.lua
Merge branch 'master' of github.com:JustinHop/Profile
Updated