update
Merge branch 'master' of https://github.com/strozw/dotfiles
update
Merge branch 'master' of https://github.com/strozw/dotfiles

Conflicts:
	home/.zsh.d/zaw
Merge branch 'master' of https://github.com/strozw/dotfiles

Conflicts:
	home/.vim/neobundle.vim
=update
=delete zaw