Begin upgrade to jasmine 2