Add better color and vim support

	modified:   .tmux.conf
Merge branch 'master' into coge