Bump underscore version.

bower.json

@@ -13,7 +13,7 @@
     "requirejs": "~2.1.15",
     "jquery": "1.11.0",
     "jed": "0.5.4",
-    "underscore": "1.6.0",
+    "underscore": "~1.8.2",
     "backbone": "1.1.2",
     "backbone.browserStorage": "*",
     "backbone.overview": "*",
@@ -33,5 +33,8 @@
     "strophejs": "https://github.com/strophe/strophejs.git#9e285eaa59f4ceb2b25e4d95c5bbe90690251bbc",
     "strophejs-plugins": "https://github.com/strophe/strophejs-plugins.git#amd"
   },
+  "resolutions": {
+    "backbone": "1.1.2"
+  },
   "exportsOverride": {}
 }

main.js

@@ -155,7 +155,6 @@ require.config({
 
     // define module dependencies for modules not using define
     shim: {
-        'underscore':           { exports: '_' },
         'crypto.aes':           { deps: ['crypto.cipher-core'] },
         'crypto.cipher-core':   { deps: ['crypto.enc-base64', 'crypto.evpkdf'] },
         'crypto.enc-base64':    { deps: ['crypto.core'] },