Cleaning up Makefile
Merge branch 'java' of github.com:jmorra/vowpal_wabbit into java