Update to latest cujo, s2js/rest