Update configuration for .marslo and tmux
Fix the conflicts for .gitconfig