added cmake build system, mostly complete #869
Merge branch 'bugfixes/tokumx-1.3'
fixed up files in cmake system for master branch #869