add .tmux.conf
Merge branch 'master' of http://github.com/clinstid/dotfiles

Conflicts:
	.fluxbox/init
	.fluxbox/menu
	.vim/.netrwhist