Configure Macvim as the standard git mergetool

Why use something else than Macvim with fugitive.vim as a mergetool?
Merge pull request #230 from treppo/patch-1

Configure Macvim as the standard git mergetool
Removed vim-slim submodule
Merge pull request #231 from andyattebery/master

Removed vim-slim submodule
Updated vim-slim submodule.
Color improvement
Added ,gt html tidy command
Sprintly alias
Merge pull request #236 from giorni/slim-update

Updated vim-slim submodule.
vim: update plugins
vim: plugins: add latexsuite plugin

Conflicts:
	.gitmodules
git: update .gitconfig

* update alias l to show 10 commits
* add alias ll with medium formatting
* set pager to less -FerX
tmux: update config

* remove reattach-to-user-namespace
* remove unused key-bindings
* added several key-bindings
* added key-bindings for each window
* replaced user with host on status-left
* polished theme
git: added/updated aliases, retabbed

* cp: don't quote where it was cherry-picked from
* lp: patch of last commit
* ru: remote update
tmux: set xterm-keys
vim: update plugins
git: add includes to config