Adding tmux config/aliases
Merge and diff tool stuffs