update
.
.
Merge branch 'master' of https://github.com/fingul/prezto

* 'master' of https://github.com/fingul/prezto:
  .
  .
  .
  .
  .
  .

Conflicts:
	runcoms/zshrc