Use lodash.noConflict for underscore

src/config.js

@@ -175,8 +175,7 @@ require.config({
         '*': {
             'jquery': 'jquery.noconflict',
             'backbone': 'backbone.noconflict',
-            'lodash': 'lodash.noconflict',
-            'underscore': 'lodash.noconflict'
+            'lodash': 'lodash.noconflict'
          },
         // '*.noconflict' wants the real module
         // If this line was not here, there would

src/underscore-shim.js

@@ -1,4 +1,4 @@
 /*global define */
-define('underscore', ['lodash'], function (_) {
-    return _;
+define(['lodash'], function (_) {
+    return _.noConflict();
 });