Updates

* new zsh aliases
* vimrc tweaks
* add diff & merge tools to gitconfig