added OSGi bundle compile, plus it appears, other uncommitted stuff from before