add optional timeouts to basic messages
bump version
Merge pull request #38 from basho/pevm-add-timeouts

Add timeouts to get, put, and delete
Merge commit '2505ff1fa3975b93150d7445b6f7b91940ecb970' into 1.4

add timeouts stuff

Conflicts:
	src/riak_pb.app.src