Resolve conflicts
[vim/vimrc] Change NERDTree from <leader>t to <leader>f
[zsh/zilsh] Add submodule
[zsh/zshrc] Add zilsh to muh zshrc.  Yeah, I'm using it now.  Shit yeah.