It seems like the best practice is that we should try to use the media manager rather than just drop in photos using the text editor method (which doesn't seem to get the photos into the media library), but how do we get the photos in the media library to be able to wrap with text and not be visually separate content?
Sometimes you'll want to add a CKEditor button not available in Drupal out of the box. This post walks you through that process.