org to gitignore
vimrc updated and refactored
zshrc updated
Merge branch 'master' of github.com:r1chelt/dotfiles

Conflicts:
	zsh/zshrc.symlink