Fix setup.py crash by updating some versions and adding marionette_client

For some reason, nailing down the marionette_client caused a different exception.  But this patch should be good enough to get things started.  Note, though, that I've only tested that "python setup.py install" actually works, and I've only tested it under virtualenv.  But this is a step in the right direction, I think.