Added OSGi and fixed some things that shook out as a result
Removed the OSGi importPackage setting, since without specifying it we get a good default