Merge pull request #25 from staticfloat/staging

Merge new GCC stuff and new imagemagick bottle