Updated to latest version of cake, with g++ bug fix of my own