PS1 now shows untracked files. PS1 shows branch relative to upstream