Merge Sorin
Merge branch 'master' of https://github.com/laerador/prezto
Revert "Merge branch 'master' of https://github.com/laerador/prezto"

This reverts commit 1272b0f0082c06d307b17fb7335d046dd2ec0efb, reversing
changes made to e580ff3efb1dcf9d175ab70181ef6908b9775606.