Added with_picture and refactored to use it.  Resolves #11
Merge branch 'no-image-carousel-fix' into develop