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
Merge branch 'master' of git://github.com/skwp/dotfiles

* 'master' of git://github.com/skwp/dotfiles:
  Fixed issue where 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
Conflicting Alias
Edited tmux status line
use base16 theme
Added modules
Update to upstream
Merge branch 'master' of git://github.com/skwp/dotfiles

* 'master' of git://github.com/skwp/dotfiles:
  Removed vim-slim submodule
  Configure Macvim as the standard git mergetool