Add timeout field to 2i messages
Merge pull request #50 from basho/gh610-2i-timeout

Add timeout field to 2i messages