Added tmux confs and other bash updates
fixxed merge issues