fixed some minor issues OSX complains about Tokutek/mongo#859
Merge branch 'osx'