Fix cmd-j and cmd-k navigate by function bindings
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Fix cmd-j and cmd-k navigate by function bindings
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
Fixed vim alias.

- Only set vim alias if MacVim is installed (using homebrew or not)
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.
Merge pull request #235 from rafaelregis/fix_vim_alias

Fixed vim alias.
Add quickfixsigns module - shows which lines changed
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Add quickfixsigns module - shows which lines changed
  Sprintly alias
  Added ,gt html tidy command
  Color improvement
  Updated vim-slim submodule.
  Fixed vim alias.
  Removed vim-slim submodule
  Configure Macvim as the standard git mergetool
  Fixed issue where the ASK environnement variable..

Conflicts:
	.gitmodules
	vim/bundle/vim-slim
	vim/plugin/settings/solarized.vim