don't test IM by default

also better GM support in Magick.def
Merge branch 'master' of github.com:jcupitt/nip2

Conflicts:
	ChangeLog
	TODO