diff --git a/vimrc b/vimrc
index e7accf7..5dc7c23 100644
--- a/vimrc
+++ b/vimrc
@@ -46,6 +46,7 @@ set laststatus=2
 set showmatch
 set incsearch
 set dictionary+=/usr/share/dict/words
+set clipboard=unnamed " yank and paste with the system clipboard
 set number
 set hlsearch
 " make searches case-sensitive only if they contain upper-case characters
@@ -78,7 +79,8 @@ syntax on
 " Also load indent files, to automatically do language-dependent indenting.
 filetype plugin indent on
 " use emacs-style tab completion when selecting files, etc
-set wildmode=longest,list
+set wildmenu
+set wildmode=longest,list,full
 colorscheme Monokai
 set wildignore+=*/tmp/*,*/log/*,*.so,*.swp,*.zip,*/rdoc/*
 set colorcolumn=90
diff --git a/zsh/aliases b/zsh/aliases
index ac97744..38dec25 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -63,8 +63,8 @@ alias zsh='vim ~/.zshrc'
 # Git
 alias ammend='amend'
 alias amend='git commit --amend'
-alias gaa='echo "Use ga!" && git add --all'
-alias ga='git add --all'
+alias gaa='echo "Use ga!" && git add -A :/'
+alias ga='git add -A :/'
 alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed
 alias gau='git add --update'
 alias gb='git branch'