Merge branch 'karma-fixes'

* karma-fixes:
  Add karma phantomjs launcher
  Use latest karma and sauce launcher
  Karma tweaks

karma.conf.js

@@ -1,20 +1,19 @@
 module.exports = function(config) {
   config.set({
-      basePath: ''
-    , frameworks: [ 'mocha' ]
+      frameworks: [ 'mocha' ]
     , files: [
           'build/build.js'
         , 'test/bootstrap/karma.js'
         , 'test/*.js'
       ]
-    , exclude: []
     , reporters: [ 'progress' ]
-    , port: 9876
     , colors: true
     , logLevel: config.LOG_INFO
     , autoWatch: false
     , browsers: [ 'PhantomJS' ]
-    , captureTimeout: 60000
+    , browserDisconnectTimeout: 10000
+    , browserDisconnectTolerance: 2
+    , browserNoActivityTimeout: 20000
     , singleRun: true
   });
 

package.json

@@ -32,9 +32,10 @@
   },
   "devDependencies": {
       "component": "*"
-    , "karma": "canary"
+    , "karma": "0.11.12"
     , "karma-mocha": "*"
-    , "karma-sauce-launcher": "git://github.com/embarkmobile/karma-sauce-launcher.git#feature-passfail"
+    , "karma-sauce-launcher": "0.2.0"
+    , "karma-phantomjs-launcher": "0.1.1"
     , "mocha": "1.8.2"
     , "istanbul": "~0.1.44"
   }