Merge pull request #150 from randy-waterhouse/develop

Turned off gtest, tests build.