Tweak build, add angular explicit dependency

bower.json

@@ -25,9 +25,22 @@
     "angular-ui-router": "^0.2.15",
     "d3-tip": "~0.6.7",
     "ng-sortable": "~1.2.1",
-    "lz-string": "~1.4.3"
+    "lz-string": "~1.4.3",
+    "angular": "!~1.4.0"
   },
   "overrides": {
+    "angular": {
+      "main": "angular.min.js"
+    },
+    "angular-ui-router": {
+      "main": "release/angular-ui-router.min.js"
+    },
+    "d3": {
+      "main": "d3.min.js"
+    },
+    "ng-lodash": {
+      "main": "build/ng-lodash.min.js"
+    },
     "ui-router-extras": {
       "main": [
         "release/modular/ct-ui-router-extras.core.min.js",
@@ -35,9 +48,7 @@
       ]
     },
     "ng-sortable": {
-      "main": [
+      "main": "dist/ng-sortable.min.js"
-        "dist/ng-sortable.min.js"
-      ]
     }
   }
 }

gulpfile.js

@@ -13,7 +13,6 @@ var gulp            = require('gulp'),
     runSequence     = require('run-sequence'),
     exec            = require('child_process').exec,
     RevAll          = require('gulp-rev-all'),
-    scp             = require( 'gulp-scp2' ),
     gutil           = require( 'gulp-util' ),
     svgstore        = require( 'gulp-svgstore' ),
     svgmin          = require( 'gulp-svgmin' ),
@@ -54,7 +53,7 @@ gulp.task('json-lint', function() {
 
 gulp.task('bower', function(){
   return gulp.src(mainBowerFiles())
-    .pipe(uglify({mangle: false}).on('error',function(e){
+    .pipe(uglify({mangle: false, compress: false}).on('error',function(e){
       console.log('Bower File:', e.fileName);
       console.log('Line:', e.lineNumber);
       console.log('Message:', e.message);