fixing bug in Makefile so it works on Dana's machine
Merge branch 'experimentalThriftIntegration' of https://github.com/dvanaken/DBx1000dist into experimentalThriftIntegration