Unbreak imagemagick
Some cleanup
Merge pull request #73 from pyhalov/imagemagick

Update imagemagick