manually set $ on Backbone for tests
Merge branch 'master' into organize_scripts
Merge pull request #416 from andyperlitch/fix_jquery_build_err

Fix jquery build error