   grunt.loadNpmTasks 'grunt-mocha'
   grunt.loadNpmTasks 'grunt-modernizr'
 
-  grunt.registerTask 'build-style', ['stylus']
+  grunt.registerTask 'build-style', ['stylus', 'concat:style']
+  grunt.registerTask 'build-scripts', ['browserify:app', 'uglify:app']
 
   grunt.registerTask 'default', ['build']
-  grunt.registerTask 'build', ['copy', 'bower', 'browserify', 'build-style', 'modernizr']
-  grunt.registerTask 'minify', ['build', 'uglify', 'cssmin']
+  grunt.registerTask 'build', ['copy', 'bower', 'build-scripts', 'build-style', 'modernizr']
+  grunt.registerTask 'minify', ['build', 'uglify:app', 'cssmin']
 
   grunt.registerTask 'dev', ['build', 'express:dev', 'watch']
 

          livereload: true

      livereload:
        options: livereload: true
        files: ['public/**/*']
      
  grunt.loadNpmTasks 'grunt-bower-task'
  grunt.loadNpmTasks 'grunt-browserify'
  grunt.loadNpmTasks 'grunt-coffeelint'
  grunt.loadNpmTasks 'grunt-contrib-copy'
  grunt.loadNpmTasks 'grunt-contrib-cssmin'
  grunt.loadNpmTasks 'grunt-contrib-stylus'

        options:
          sourceMap: true

      vendor:
        files:
          'public/js/vendor.js': ['public/vendor/**/*.js']

    watch:
      bower:
        files: ['bower.json']
        tasks: ['bower']

      clientjs:
        files: ['client/**/*.{coffee,hbs}']
        tasks: ['browserify:app']

      vendor:
        files: ['bower_components/**/*']
        tasks: ['uglify:vendor']

      assets:
        files: ['client/assets/**/*.*']
        tasks: ['copy']

      style:
        files: ['client/style/**/*.styl']
