cal with new format and correct week begin
added +/- to git upstream relation for non-vga-terminals (eg tty)