merged in changes from server and added tmux conf