Fixes to get this to build on Darwin, and fixing of unit test problems
Merge pull request #3 from bckelly80/acbecker/ticket2

Fixes to get this to build on Darwin, and fixing of unit test problems