new tmux conf
use vim instead of mvim
some additions to vimrc
merge