updated
Added zshrc
Merge remote-tracking branch 'github/master'

Conflicts:
	_vim/vimrc.neobundle.vim