fix and add neocomplcache settings for php
fix .zshrc
Merge branch 'master' of github.com:taiki45/dotfiles

Conflicts:
	.vimrc