Deal with Mavericks changing some typedefs.
Merge pull request #5 from Shopify/mavericks

Mavericks