Fixed issue where the ASK environnement variable..

was not taken into account when doing a ASK=true rake install
Merge pull request #228 from alikaragoz/master

Fix issue to take into account the ASK environnement variable
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