Small improvements

Join spaces for Vim and improved tmux config