Refactor KillbillActivator so it exports only one OSGIKillbill service conatining everyhting the plugin needs -- including a DataSource
Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill into new-paymentpluginapi

Conflicts:
	osgi/src/main/java/com/ning/billing/osgi/glue/DefaultOSGIModule.java