cleaning up a bit and switching to the environ vars that CB appears to be going with in http://review.couchbase.org/#/c/36101/