I'd say we should go with Cmd+/ and Cmd+Shift+/ as that seems the most common by a small margin - however, I'm still not convinced that we don't need two keys for optimal behaviour of line commenting.
To be clear, I'm not 100% convinced either. I am, however, convinced that it is the right first step and then we can get user feedback. -- Rob
