bring over accidentally wiped-out changes. fixes tests
remove remaining underscore dependencies in test, remap jquery and underscore to use fallbacks