Comment 3 for bug 683735

Branch attached. I did not change the behavior when clicking on the same application icon again. I believe in pre-compiz unity, it would also cancel the 'expose' (or scale, as I've now learned it's called). I wasn't sure if that was desired behavior or not, so I just fixed the more pressing issue of switching to other apps.