Problem with test setup (crdt branch)

Pinged @seancribbs on this already, just wanted to make sure it was tracked.

Using Python as installed with CentOS 6.5: version 2.6.6.

(py_env)[jdaily@thunderc1 riak-python-client]$ python ./setup.py configure --riak-admin=/home/jdaily/github/Basho/2.0/riak/rel/riak/bin/riak-admin
running configure
running create_bucket_types
Traceback (most recent call last):
  File "./setup.py", line 41, in <module>
    'Topic :: Database']
  File "/usr/lib64/python2.6/distutils/core.py", line 152, in setup
    dist.run_commands()
  File "/usr/lib64/python2.6/distutils/dist.py", line 975, in run_commands
    self.run_command(cmd)
  File "/usr/lib64/python2.6/distutils/dist.py", line 995, in run_command
    cmd_obj.run()
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 446, in run
    self.run_command(cmd_name)
  File "/usr/lib64/python2.6/distutils/cmd.py", line 333, in run_command
    self.distribution.run_command(command)
  File "/usr/lib64/python2.6/distutils/dist.py", line 995, in run_command
    cmd_obj.run()
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 97, in run
    self._create_and_activate_type(name, self._props[name])
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 119, in _create_and_activate_type
    status = self.check_btype_command('status', name)
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 145, in check_btype_command
    return self.check_output(cmd)
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 104, in check_output
    return check_output(*args, **kwargs)
  File "/home/jdaily/github/Basho/2.0/riak-python-client/commands.py", line 51, in check_output
    raise CalledProcessError(retcode, cmd, output=output)
TypeError: __init__() got an unexpected keyword argument 'output'

basho / riak-python-client

Problem with test setup (crdt branch) #348