Add ImageMagick to mac install instructions
Merge remote-tracking branch 'upstream/master' into update-mac-doc
Merge pull request #2397 from adamloving/update-mac-doc

Add ImageMagick to mac install instructions