Update Makefile for compatibility with CDH4
Minor Makefile cleanup
Merge pull request #39 from mreid-moz/cdh4-compat

Update Makefile for compatibility with CDH4