Modified README to include note on java dependency
Modified makefile for OS independance
Merge pull request #3 from andrewlcg/master

Makefile changes - one makefile to rule them all