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