Merge branch 'aaronroberson-master' into dev

Conflicts:
	package.json

Author: l-lin

index.js

@@ -0,0 +1,11 @@
+require('./dist/angular-datatables');
+require('./dist/plugins/bootstrap/angular-datatables.bootstrap');
+require('./dist/plugins/bootstrap/datatables.bootstrap.css');
+require('./dist/plugins/colreorder/angular-datatables.colreorder');
+require('./dist/plugins/columnfilter/angular-datatables.columnfilter');
+require('./dist/plugins/colvis/angular-datatables.colvis');
+require('./dist/plugins/fixedcolumns/angular-datatables.fixedcolumns');
+require('./dist/plugins/fixedheader/angular-datatables.fixedheader');
+require('./dist/plugins/scroller/angular-datatables.scroller');
+require('./dist/plugins/tabletools/angular-datatables.tabletools');
+module.exports = 'datatables';

package.json

@@ -1,8 +1,42 @@
 {
 	"name": "angular-datatables",
 	"version": "0.5.0",
-	"dependencies": {},
-	"author": "l-lin",
+    "author": "l-lin",
+    "main": "index.js",
+	"ignore": [
+        ".bowerrc",
+        ".editorconfig",
+        ".git*",
+        ".jshintrc",
+        ".esformatter",
+        "Gruntfile.js",
+        "test",
+        "src",
+        ".travis.yml",
+        "vendor",
+        "data.json",
+        "data1.json",
+        "demo",
+        "favicon.png",
+        "index.html",
+        "README.md",
+        "CONTRIBUTING.md",
+        "server.js",
+        "styles",
+        "_config.yml",
+        "grunt",
+        "images",
+        "bower.json",
+        "archives",
+        "archives.json",
+        "dtOptions.json",
+        "dtColumns.json"
+    ],
+    "dependencies": {
+        "angular": ">=1.3.0",
+        "jquery": ">=1.11.0",
+        "datatables": ">=1.10.0"
+    },
 	"devDependencies": {
         "grunt": "~0.4.1",
         "grunt-express": "1.4.1",