Bump riak_pb dep to 1.4.0.7
Roll riak_api 1.4.0
Merge branch '1.4'
Merge branch 'master' into dev

Conflicts:
	rebar.config