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.
submodules update
I want to use ctrlp with regexp, not filename
overwrite zpreztorc
git st as status --short
remove diff color settings, conflict with solarized
add git lg
add vimrc.before
add vim-twig plugin
use my personal theme please
don't show quickfix window automatically
update ctrl-p custom ignore

ignore symfony2 directories
ignore files