Pin the protobuffs dependency until bumped.
Version bump to 1.4.0.1

This uses the new versioning scheme discussed in
https://github.com/basho/riak_pb/wiki.
Merge commit '2505ff1fa3975b93150d7445b6f7b91940ecb970' into 1.4

add timeouts stuff

Conflicts:
	src/riak_pb.app.src
Update pom.xml

Changing pom to be correct at 1.4.0-SNAPSHOT
Merge branch 'master' into 1.4
Bump to 1.4.0.3
Merge branch 'master' into 1.4
Merge branch 'master' into 1.4
Bump to 1.4.0.4
Merge tag '1.4.0.4' into pt29-2i-pagination
Fix mystery missing `8` from 2i message