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

Conflicts:
	.zprezto/runcoms/zshrc
	bin/composer