Upgrade to caber2

Which gives us comments.
Also update modules
Also add client/ to browserify paths so we don't need relative paths