Using newer cuttlefish datatypes
Pointing branches back to develop for merge
Merge pull request #378 from basho/jd-cuttlefish

Using newer cuttlefish datatypes
Merge remote-tracking branch 'origin/develop' into eas-pevm-basic-perf-test

Conflicts:
	rel/files/riak.schema
more wip brokenness