Removed jasmine-jquery dep & fixed bad merge

Fixes #49