Merge pull request #335 from jschneier/master

fix skipping tests on OSX