Partial revert build system. Fix errors.
Merge pull request #1 from randy-waterhouse/master

Partial revert build system. Fix errors.