Differentiate between tracked/untracked changes

Also inserted trailing spaces to play more nicely with my prompt