Allow passing opts to union store
Conflicts:
	lib/redis/sorted_set.rb
Add tests for unionstore/interstore functionality
Merge remote-tracking branch 'upstream/master' into zunion-api

* upstream/master: (44 commits)
  Refactoring List range argument
  Fix SortedSet range argument
  Delete VERSION
  version bump and changelog
  fix bad marshal calls in SortedSet. closes #127
  Handle marshalling/unmarshalling of nil values
  add :default option to Counter
  Add incrbyfloat and decrbyfloat for values and hashes
  Changelog updates in preparation for 0.9.0
  Better naming for internal marshal functions to avoid confusion
  Ensure we don't double-unmarshal values, which could be a security issue
  fix the expiration options of SortedSet
  Don't start redis when we detect the platform is running JRuby
  additional tests for @sorted_set.merge
  redis.rdb can no longer be an absolute path for some reason
  noop if you try to add an empty array to a set
  restore README from upstream
  remove unused code
  fix expireat
  rebase to upstream master
  ...

Conflicts:
	spec/redis_objects_instance_spec.rb
allow unionstore and interstore between sorted sets and sets
Merge pull request #142 from jrdi/zunion-api

Allow unionstore and interstore between sorted sets and sets