Compile fixes for OS X 10.8
Merge branch '1.0' of https://github.com/Eyescale/Collage into 1.0
Merge pull request #62 from eile/1.0

Compile fixes for OS X 10.8