Fixes and cleanup as suggested by @eric

	See https://github.com/aphyr/riemann-ruby-client/pull/18#issuecomment-41761783