Added timeout param to Client.wait
timeout param in wait documented
Merge branch 'jseybold-master'