Merge remote-tracking branch 'robbyrussel/master' into tfnico
Only include timestamp in right-prompt

I get user@host from the tmux window bottom bar.