Updating to accomodate both jasmine 1.x and 2.x