Some work on supporting both Linux and OS X with Travis-CI (#369).