Fix git log pretty format argument
Fix node-info to show right node version

Currently, node-info shows nothing if $version is different than 'none'.
Merge branch 'master' of https://github.com/sorin-ionescu/prezto

* 'master' of https://github.com/sorin-ionescu/prezto:
  Fix node-info to show right node version
  Fix git log pretty format argument