Image master merge

Fixed ImageMagick and other issues. Probably need to work on the resize to make sure it is aesthetically correct! :-)