Adding a default zshrc
Adding script that will configure vim
Adding setup files for git
Forgot to include the vimrc
Merge branch 'master' of github.com:jvtrigueros/dotfiles

Conflicts:
	vimrc.symlink