Some updates to vimrcs
Load a private shell file in .zshrc
Delete unecessary vim plugin
Merge branch 'master' of github.com:take/dotfiles

Conflicts:
	.vim/bundle/neobundle.vim