Merge pull request #78 from BugFreeSoftware/chai_fix

Fixed Windows not using header-only version of Chai
Fixed make install for OSX.
Merge pull request #79 from murrekatt/develop

Fixed make install for OSX.