Terminal title now only shortend if longer than 25 characters
Merge branch 'master' of https://github.com/rhollister/zsh