Removed unnecessary else clause
Changed org.osgi.core dependency to match latest version in karaf 3 snapshot
Tidy up.