Implement RpcProxy.with_timeout()
Merge remote-tracking branch 'origin/master'

Conflicts:
	syncstomp/rpc.py