modified:   .tmux.conf
Merge branch 'master' of github.com:nbari/my-vim
	modified:   .vimrc