Use diff3 as merge.conflictstyle in git
Disable two-finger gestures in Chrome
Clean up profile
Add bindings for maximizing panes in tmux
Completely remove mouse support in tmux
Plugin updates in vim
Remove things that are already in vim-sensible
Git improvements for search
Add miscellaneous settings to git

* Added %% macro to expand file path
* Disabled arrow keys in normal mode
* Restored comma function
Add changes to vim wildmenu and wildmode