title: Getting "Vim: Caught deadly signal ILL" when trying to do basic git operations
body: <p>When I run</p>
  
  <pre><code>$git pull
  </code></pre>
  
  <p>I get:</p>
  
  <pre><code>Vim: Caught deadly signal ILL
  Vim: Finished.
  error: vi died of signal 4
  error: There was a problem with the editor 'vi'.
  Not committing merge; use 'git commit' to complete the merge.
  </code></pre>
  
  <p>When I run</p>
  
  <pre><code>$git rebase -i HEAD~10
  </code></pre>
  
  <p>I get:</p>
  
  <pre><code>Vim: Caught deadly signal ILL
  Vim: Finished.
  /opt/boxen/homebrew/Cellar/git/1.8.0-boxen1/libexec/git-core/git-rebase--interactive: line  212: 40705 Illegal instruction: 4  vi "$@"
   Could not execute editor
  </code></pre>
  
  <p>I used to get errors when I ran:</p>
  
  <pre><code>$vi
  </code></pre>
  
  <p>But was able to get around them by adding these lines to my .bashrc:</p>
  
  <pre><code>alias vi='/opt/boxen/homebrew/Cellar/vim/7.3.843/bin/vim'
  alias vim='/opt/boxen/homebrew/Cellar/vim/7.3.843/bin/vim'
  </code></pre>
  
  <p>This is killing my workflow, any ideas on fixing it?</p>