ENH : if explicitly passed labels draw them by default

If the user passes in labels as a kwarg, default to drawing them
(but don't if `with_labels` is explicitly False).

This is a follow up to the discussion in #936.

Not sure how you want this behavior documented.

I can get rid of the whitespace changes if you want as well.