Remove macvim install
Use tmux by default
Merge branch 'master' of https://github.com/ianks/dotfiles-1

* 'master' of https://github.com/ianks/dotfiles-1:
  Install terminal vim