added tmux configuration
merging things