Aliases and zshrc added
Merge branch 'master' of https://github.com/mihcall/dotfiles

* 'master' of https://github.com/mihcall/dotfiles:
  added windows version of vimrc