Updated Particle-Development branch Makefile to latest from master

so it works with ImageMagick headers on Macs now. Also, continued
poking at particle shaders