Convert to cbdrawer & cleanup

Also updated usage of hiccup to newer API
Merge pull request #1 from apage43/master

fixup for couchbase patch