Updates to build scripts
Makefile fixes for riemann-client