Allow for a silent zsh startup if required
Add current time to prompt
Merge branch 'master' of github.com:mscharley/dotfiles