Clean up bash config
Move tmux init to t command
Use 3-way diff for fugitive