Update the toy chiyoung build to reflect the current master branch

Change-Id: Ib6c2ef4569645f4ba1d339a5a27f884f8982f26b
Reviewed-on: http://review.couchbase.org/29379
Reviewed-by: Michael Wiederhold <mike@couchbase.com>
Tested-by: Michael Wiederhold <mike@couchbase.com>