Changes for leaner-build branch (extracted APIs).

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Merge remote-tracking branch 'origin/master' into leaner-build

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>

Conflicts:
	Jarfile
gemspec: update killbill to 1.1.2

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>