Removed all of my edits and reincorporated Vaughan's.

Should now look like you expect it to.



git-svn-id: http://audacity.googlecode.com/svn/audacity-src/trunk@13626 47890b92-0858-11df-a26f-8b716316a5bc