removes imagemagick and includes minimagick instead
scales and crops uploaded images to 400x400
cleans up merge detritus