use my own couchbase client repo
Merge branch 'master' of https://github.com/funkygao/fae

Conflicts:
	servant/couch/client.go