Misc prompt fixes:

* No sense finding SVN root directory unless we know it's a working copy
* Display an abbreviated path when more than 6 directories would be displayed
Merge 631ed70