Added extra copy-mode bindings to tmux
that allow transfer of the contents of tmux's paste buffers to X's paste buffers
Fixed merge conflict with .xinitrc