Fix horribly broken 446a254479a55bea77682935468a4a21a613fe30
Adjust for different RGB handling in ImageMagick

See http://www.imagemagick.org/script/color-management.php
Merge pull request #183 from timholy/teh/fixtravis

Fix broken commit and adjust for different ImageMagick library versions