removing node modules ExactTarget#2

- updated grunt requirejs because of new version
- added build badge to readme for branch

Gruntfile.js

@@ -84,6 +84,7 @@ module.exports = function (grunt) {
 				eqeqeq: true,
 				immed: true,
 				latedef: true,
+				laxcomma: true,
 				newcap: true,
 				noarg: true,
 				sub: true,
@@ -114,27 +115,28 @@ module.exports = function (grunt) {
 			combine: {
 				options: {
 					appDir: 'src',
-					baseUrl: '.',
-					dir: 'dist',
+					dir: 'dist/',
+					baseUrl: './',
 					optimize: 'none',
 					optimizeCss: 'none',
 					normalizeDirDefines: 'all',
 					wrap: true,
+					logLevel: 0,
 					paths: {
 						almond: '../lib/almond',
 						bootstrap: '../lib/bootstrap/js',
 						jquery: '../lib/jquery-1.9.1.min',
-						fuelux: '../dist'
+						fuelux: '../src/'
 					},
 					modules: [
 						{
-							name: 'fuelux/all',
-							exclude: ['jquery']
-						},
-						{
-							name: 'fuelux/loader',
-							include: ['almond', 'fuelux/all'],
-							exclude: ['jquery']
+							name: 'fuelux/all'
+							, exclude: [ 'jquery' ]
+						}
+						, {
+							name: 'fuelux/loader'
+							, exclude: [ 'jquery' ]
+							, include: [ 'almond', 'fuelux/all' ]
 						}
 					]
 				}

README.md

@@ -2,6 +2,8 @@
 
 [![Fuel UX](https://s3.amazonaws.com/fuelux/logo-gray.png)](http://exacttarget.github.com/fuelux)
 
+[![Build Status](https://travis-ci.org/ExactTarget/fuelux.svg?branch=fuelux2)](https://travis-ci.org/ExactTarget/fuelux)
+
 Fuel UX extends Bootstrap with additional lightweight JavaScript controls.
 Other benefits include easy installation into web projects, integrated scripts for customizing Bootstrap and Fuel UX,
 simple updates, and solid optimization for deployment. All functionality is covered by live documentation and unit tests.

dist/all.js

@@ -1,5 +1,4 @@
-(function () {
-//Wrapped in an outer function to preserve global this
+(function () {//Wrapped in an outer function to preserve global this
 (function (root) { var amdExports; define('bootstrap/bootstrap-transition',['jquery'], function () { (function () {
 
 /* ===================================================
@@ -6247,4 +6246,5 @@ define('fuelux/all',['require','jquery','bootstrap/bootstrap-affix','bootstrap/b
 	require('fuelux/tree');
 	require('fuelux/wizard');
 });
+
 }());

dist/loader.js

@@ -1,5 +1,4 @@
-(function () {
-/**
+(function () {/**
  * almond 0.1.4 Copyright (c) 2011, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/almond for details
@@ -6603,4 +6602,5 @@ define('moment', [], function () {});
 
 define('fuelux/loader', ['fuelux/all'], function () {});
 
-require('fuelux/loader');}());
+require('fuelux/loader');
+}());

package.json

@@ -29,17 +29,17 @@
     "test": "grunt travisci"
   },
   "devDependencies": {
+    "grunt": "~0.4.1",
     "grunt-contrib-clean": "~0.4.1",
-    "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-compress": "~0.5.0",
-    "grunt-contrib-requirejs": "~0.4.0",
-    "grunt-recess": "~0.3.3",
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-watch": "~0.4.3",
     "grunt-contrib-connect": "~0.3.0",
-    "grunt": "~0.4.1",
+    "grunt-contrib-copy": "~0.4.1",
     "grunt-contrib-jshint": "~0.4.3",
     "grunt-contrib-qunit": "~0.2.1",
+    "grunt-contrib-requirejs": "~0.4.0",
+    "grunt-contrib-uglify": "~0.2.0",
+    "grunt-contrib-watch": "~0.4.3",
+    "grunt-recess": "~0.3.3",
     "grunt-saucelabs": "~4.0.2"
   },
   "keywords": [