Conflicts:
	bin/embedly_oembed.js
	lib/embedly.js
	package.json
	test/objectify-test.js
	test/oembed-test.js
	test/services-test.js