git_dirty now works with new git that has strange output, and error status code is included in prompt