Modify makefiles to do a jar build of NQP
Merge branch 'master' of github.com:perl6/nqp

Conflicts:
	tools/build/Makefile-JVM.in