Fish: Move my functions into config.fish
Git: Set merge config to default to upstream
Git: Update aliases