Remove git difftool alias
Fix up zprezto configuration
Merge branch 'master' of github.com:LBRapid/dotfiles

* 'master' of github.com:LBRapid/dotfiles:
  Update zprezto
  Add vim-fireplace