imagemagick: make --without-magick-plus-plus optional

Closes #19254.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Merge branch 'master' of http://github.com/mxcl/homebrew