Fixing everything I broke on the backbonemove branch