dry lib, raise error on search failure (tests not passing!)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/oss_rb.rb
	spec/api/api_v1_spec.rb