diff --git a/.gitignore b/.gitignore
index ac41b4481d..d6416aac80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,4 @@ Sauce-Connect.jar
 *.log
 docs
 bower_components
+.grunt
diff --git a/Gruntfile.js b/Gruntfile.js
index a0a8af9df8..6be27ee6d2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -60,12 +60,12 @@ module.exports = function(grunt) {
       dist: {
         // paths: ['/bower_components/bootstrap'],
         files: {
-          'dist/<%= pkg.name %>.css': 'src/less/main.less',
+          'dist/release/<%= pkg.name %>.css': 'src/less/main.less',
         }
       },
       min: {
         files: {
-          'dist/<%= pkg.name %>.min.css': 'src/less/main.less',
+          'dist/release/<%= pkg.name %>.min.css': 'src/less/main.less',
         },
         options: {
           compress: true
@@ -79,11 +79,7 @@ module.exports = function(grunt) {
       },
       concat: {
         src: '<%= concat.dist.dest %>',
-        dest: 'dist/<%= pkg.name %>.min.js'
-      },
-      doc: {
-        src: '<%= concat.dist.dest %>',
-        dest: 'docs/js/<%= pkg.name %>.min.js'
+        dest: '<%= dist %>/release/<%= pkg.name %>.min.js'
       }
     },
 
@@ -240,7 +236,7 @@ module.exports = function(grunt) {
         styles: [
           'misc/doc/css/prettify.css',
           'misc/doc/css/bootstrap-flatly.css',
-          '<%= dist %>/ui-grid.css'
+          '<%= dist %>/release/ui-grid.css'
         ],
         title: 'UI Grid',
         html5Mode: false,
diff --git a/TODO.md b/TODO.md
index 721931f7a7..e19b7f82b4 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,3 +1,6 @@
 1. Copy angular-animate, prettify.js and marked.js into the docs/js dir separately from grunt-ngdocs. It's causing them to show up in `<script>` tags in the Examples which isn't what we want
-1. Add --browsers option for testing on saucelabs with specific browser(s)
-1. Make karmangular run in `watch` mode and in singlerun too.
\ No newline at end of file
+1. Fix saucelabs hanging tests
+1. Make sure failing saucelabs tests don't cause the build to fail. Only if the normal test run fails
+
+1. [DONE] Add --browsers option for testing on saucelabs with specific browser(s)
+1. [DONE] Make karmangular run in `watch` mode and in singlerun too.
\ No newline at end of file