Pulled in Collin Estes' changeset for jasmine testing