Changed smithlab_cpp to submodule. Fixed one Make file. Updated src/util.