Merge branch 'testing' into release

Conflicts:
	dist/crafty-min.js
	dist/crafty.js
	package.json

.travis.yml

@@ -3,3 +3,6 @@ node_js:
   - "0.10"
 before_script:
   - npm install -g grunt-cli
+cache:
+  directories:
+    - node_modules

Gruntfile.js

@@ -3,18 +3,14 @@ var fs = require('fs');
 
 module.exports = function (grunt) {
     var pkg = grunt.file.readJSON('package.json');
-    var fileList = pkg.files, version = pkg.version;
+    var version = pkg.version;
     var banner =    '/**\n' +
                     ' * <%= pkg.name %> <%= pkg.version %>\n' +
                     ' * <%= pkg.author.url %>\n *\n' +
                     ' * Copyright <%= grunt.template.today("yyyy") %>, <%= pkg.author.name %>\n' +
                     ' * Dual licensed under the MIT or GPL licenses.\n' +
                     ' */\n\n';
 
-    var getFiles = function (){
-        return fileList;
-    };
-
     var docGen = function(){
         done = this.async();
         buildDir = "build/api/";
@@ -24,7 +20,8 @@ module.exports = function (grunt) {
             done();
         };
         var md = require("./build/api-gen");
-        md.document(getFiles(), buildDir, "build/template.html", version, callback);
+        md.document(grunt.file.expand('src/*.js'),
+            buildDir, "build/template.html", version, callback);
     };
 
     // Project configuration.
@@ -47,12 +44,12 @@ module.exports = function (grunt) {
         browserify: {
             dist: {
                 files: {
-                    'crafty.js': ['src/*.js']
+                    'crafty.js': ['src/crafty.js']
                 }
             },
             debug: {
                 files: {
-                    'crafty.js': ['src/*.js']
+                    'crafty.js': ['src/crafty.js']
                 },
                 options: {
                     debug: true
@@ -76,23 +73,23 @@ module.exports = function (grunt) {
         },
 
         jshint: {
-            files: ['Gruntfile.js', 'src/**/*.js', 'tests/*.js'],
+            files: ['Gruntfile.js', 'src/**/*.js', 'tests/**/*.js'],
             options: {
                 trailing: true,
+                ignores: ['tests/lib/*.js'],
                 globals: {
                 }
             }
         },
 
         qunit: {
             all: [
-                'tests/index.html',
-                'tests/animation/animation.html'
+                'tests/index.html'
             ]
         },
 
         jsvalidate: {
-            files: ['crafty.js', 'tests/*.js']
+            files: ['crafty.js', 'tests/**/*.js']
         },
 
         connect: {

README.md

@@ -1,4 +1,5 @@
-# Crafty JS
+# Crafty JS [![Build Status](https://travis-ci.org/craftyjs/Crafty.png?branch=develop)](https://travis-ci.org/craftyjs/Crafty)
+
 
 Crafty is a JavaScript game library that can help you create games in a structured way…
 

bower.json

@@ -1,9 +1,16 @@
 {
   "name": "crafty",
-  "main": "crafty.js",
   "version": "0.6.2",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/craftyjs/Crafty.git"
-  }
+  "main": "dist/crafty.js",
+  "license": "MIT",
+  "ignore": [
+    "**/.*",
+    "build",
+    "playgrounds",
+    "test",
+    "*.md",
+    "changelog.txt",
+    "Gruntfile.js",
+    "package.json"
+  ]
 }