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'.
[Fix #713] Set prompt theme off in unsupported terminal
Use short apothegms only in fortune
merge upstream