add more colorspaces for ImageMagick >= 6.8.5
fix MacOS compilation

/usr/include/MacTypes.h defines nil as NULL. This borks boost (and any
library which uses the not-so-uncommon word "nil").
The p parameter conflicts with stuff in boost's MPL