diff --git a/.jshintrc b/.jshintrc
index e30736b5..7fc1d7af 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,21 +1,27 @@
 {
-	"predef": [
-		"SWARM"
-	],
+    "boss": true,
+    "curly": true,
+    "eqeqeq": true,
+    "eqnull": true,
+    "expr": true,
+    "immed": true,
+    "noarg": true,
+    "onevar": true,
+    "quotmark": "double",
+    "smarttabs": true,
+    "trailing": true,
+    "undef": true,
+    "unused": true,
 
-	"bitwise": true,
-	"curly": true,
-	"eqeqeq": true,
-	"immed": true,
-	"latedef": true,
-	"newcap": true,
-	"noarg": true,
-	"noempty": true,
-	"undef": true,
-	"trailing": true,
+    "bitwise": true,
+    "browser": true,
+    "es3": true,
+    "latedef": true,
+    "newcap": true,
+    "noempty": true,
 
-	"smarttabs": true,
-
-	"browser": true,
-	"jquery": true
+    "predef": [
+        "SWARM",
+        "jQuery"
+    ]
 }
diff --git a/js/addjob.js b/js/addjob.js
index 1331e8ae..e7e1a9d9 100644
--- a/js/addjob.js
+++ b/js/addjob.js
@@ -1,42 +1,41 @@
 /**
  * JavaScript file for the "addjob" page.
  *
- * @author Timo Tijhof, 2012
+ * @author Timo Tijhof
  * @since 1.0.0
  * @package TestSwarm
  */
-jQuery(function ( $ ) {
-	var $runsContainer, $addRunBtn, $runFieldsetClean, cnt;
+jQuery(function( $ ) {
+	var $addRunBtn,
+		$runsContainer = $( "#runs-container" ),
+		$runFieldsetClean = $runsContainer.children( "fieldset" ).eq( 0 ).clone().detach(),
+		cnt = $runsContainer.children( "fieldset" ).length;
 
-	$runsContainer = $('#runs-container');
-	$runFieldsetClean = $runsContainer.children('fieldset').eq(0).clone().detach();
-	cnt = $runsContainer.children('fieldset').length;
-
-	$addRunBtn = $('<button>')
-		.text('+ Run')
-		.addClass('btn')
+	$addRunBtn = $( "<button>" )
+		.text( "+ Run" )
+		.addClass( "btn" )
 		.click(function ( e ) {
 			e.preventDefault();
 
 			cnt += 1;
 
 			function fixNum( i, val ) {
-				return val.replace( '1', cnt );
+				return val.replace( "1", cnt );
 			}
 
 			$addRunBtn.before(
 				$runFieldsetClean.clone()
-					.find('input').val('')
+					.find( "input" ).val( "" )
 					.end()
-					.find('[for*="1"]').attr('for', fixNum)
+					.find( "[for*='1']" ).attr( "for", fixNum )
 					.end()
-					.find('[id*="1"]').attr('id', fixNum)
+					.find( "[id*='1']" ).attr( "id", fixNum )
 					.end()
-					.find('legend').text(fixNum)
+					.find( "legend" ).text( fixNum )
 					.end()
 			);
 		})
-		.appendTo('<div class="form-actions"></div>')
+		.appendTo( "<div class='form-actions'></div>" )
 		.parent();
 
 	$runsContainer.append( $addRunBtn );
diff --git a/js/inject.js b/js/inject.js
index f3a72248..3596acad 100644
--- a/js/inject.js
+++ b/js/inject.js
@@ -3,26 +3,23 @@
  * inside the iframe on the "run" pages. This injection must be done
  * by the guest page, it can't be loaded by TestSwarm.
  * Example:
- * - https://github.com/jquery/jquery/blob/master/test/data/testrunner.js
- * - https://github.com/jquery/jquery/blob/master/test/index.html
+ * - https://github.com/jquery/jquery/blob/2.0.0/test/data/testrunner.js
+ * - https://github.com/jquery/jquery/blob/2.0.0/test/index.html
  *
- * @author John Resig, 2008-2011
- * @author Timo Tijhof, 2012
+ * @author John Resig
+ * @author Timo Tijhof
  * @since 0.1.0
  * @package TestSwarm
  */
 /*global QUnit, Test, JSSpec, JsUnitTestManager, SeleniumTestResult, LOG, doh, Screw, mocha */
-(function ( undefined ) {
-	var DEBUG, doPost, search, url, index, submitTimeout, curHeartbeat,
-		beatRate, testFrameworks, onErrorFnPrev;
-
-	DEBUG = false;
-
-	doPost = false;
-	search = window.location.search;
-	index = search.indexOf( 'swarmURL=' );
-	submitTimeout = 5;
-	beatRate = 20;
+(function( undefined ) {
+	var url, curHeartbeat, testFrameworks, onErrorFnPrev,
+		DEBUG = false,
+		doPost = false,
+		search = window.location.search,
+		index = search.indexOf( "swarmURL=" ),
+		submitTimeout = 5,
+		beatRate = 20;
 
 	try {
 		doPost = !!window.parent.postMessage;
@@ -32,27 +29,27 @@
 		url = decodeURIComponent( search.slice( index + 9 ) );
 	}
 
-	if ( !DEBUG && ( !url || url.indexOf( 'http' ) !== 0 ) ) {
+	if ( !DEBUG && ( !url || url.indexOf( "http" ) !== 0 ) ) {
 		return;
 	}
 
 	// Prevent blocking things from executing
 	if ( !DEBUG ) {
-		window.print = window.confirm = window.alert = window.open = function () {};
+		window.print = window.confirm = window.alert = window.open = function() {};
 	}
 
 	/** Utility functions **/
 
 	function debugObj( obj ) {
-		var i, str = '';
+		var i, str = "";
 		for ( i in obj ) {
-			str += ( str ? '\n' : '' ) + i + ':\n\t ' + obj[i];
+			str += ( str ? "\n" : "" ) + i + ":\n\t " + obj[i];
 		}
 		return str;
 	}
 
 	function remove( elem ) {
-		if ( typeof elem === 'string' ) {
+		if ( typeof elem === "string" ) {
 			elem = document.getElementById( elem );
 		}
 
@@ -65,18 +62,18 @@
 		var scripts, root, cur, links, i, href;
 		doc = doc || document;
 
-		scripts = doc.getElementsByTagName( 'script' );
+		scripts = doc.getElementsByTagName( "script" );
 		while ( scripts.length ) {
 			remove( scripts[0] );
 		}
 
-		root = window.location.href.replace( /(https?:\/\/.*?)\/.*/, '$1' );
-		cur = window.location.href.replace( /[^\/]*$/, '' );
+		root = window.location.href.replace( /(https?:\/\/.*?)\/.*/, "$1" );
+		cur = window.location.href.replace( /[^\/]*$/, "" );
 
-		links = doc.getElementsByTagName( 'link' );
+		links = doc.getElementsByTagName( "link" );
 		for ( i = 0; i < links.length; i += 1 ) {
 			href = links[i].href;
-			if ( href.indexOf( '/' ) === 0 ) {
+			if ( href.indexOf( "/" ) === 0 ) {
 				href = root + href;
 			} else if ( !/^https?:\/\//.test( href ) ) {
 				href = cur + href;
@@ -84,8 +81,8 @@
 			links[i].href = href;
 		}
 
-		return ( '<html>' + doc.documentElement.innerHTML + '</html>' )
-			.replace( /\s+/g, ' ' );
+		return ( "<html>" + doc.documentElement.innerHTML + "</html>" )
+			.replace( /\s+/g, " " );
 	}
 
 	function submit( params ) {
@@ -95,11 +92,11 @@
 			clearTimeout( curHeartbeat );
 		}
 
-		paramItems = (url.split( '?' )[1] || '' ).split( '&' );
+		paramItems = ( url.split( "?" )[1] || "" ).split( "&" );
 
 		for ( i = 0; i < paramItems.length; i += 1 ) {
 			if ( paramItems[i] ) {
-				parts = paramItems[i].split( '=' );
+				parts = paramItems[i].split( "=" );
 				if ( !params[ parts[0] ] ) {
 					params[ parts[0] ] = parts[1];
 				}
@@ -107,7 +104,7 @@
 		}
 
 		if ( !params.action ) {
-			params.action = 'saverun';
+			params.action = "saverun";
 		}
 
 		if ( !params.report_html ) {
@@ -120,24 +117,24 @@
 
 		if ( doPost ) {
 			// Build Query String
-			query = '';
+			query = "";
 
 			for ( key in params ) {
-				query += ( query ? '&' : '' ) + key + '=' + encodeURIComponent( params[key] );
+				query += ( query ? "&" : "" ) + key + "=" + encodeURIComponent( params[key] );
 			}
 
 			if ( !DEBUG ) {
-				window.parent.postMessage( query, '*' );
+				window.parent.postMessage( query, "*" );
 			}
 
 		} else {
-			form = document.createElement( 'form' );
+			form = document.createElement( "form" );
 			form.action = url;
-			form.method = 'POST';
+			form.method = "POST";
 
 			for ( i in params ) {
-				input = document.createElement( 'input' );
-				input.type = 'hidden';
+				input = document.createElement( "input" );
+				input.type = "hidden";
 				input.name = i;
 				input.value = params[i];
 				form.appendChild( input );
@@ -148,7 +145,7 @@
 
 			} else {
 				// Watch for the result submission timing out
-				setTimeout(function () {
+				setTimeout(function() {
 					submit( params );
 				}, submitTimeout * 1000);
 
@@ -175,8 +172,10 @@
 	// Cover uncaught exceptions
 	// Returning true will suppress the default browser handler,
 	// returning false will let it run.
-	window.onerror = function ( error, filePath, linerNr ) {
-		var ret = false, report;
+	window.onerror = function( error, filePath, linerNr ) {
+		var report,
+			ret = false;
+
 		if ( onErrorFnPrev ) {
 			ret = onErrorFnPrev( error, filePath, linerNr );
 		}
@@ -184,11 +183,11 @@
 		// Treat return value as window.onerror itself does,
 		// Only do our handling if not suppressed.
 		if ( ret !== true ) {
-			report = document.createElement( 'div' );
-			report.innerHTML = '<hr/><b>[TestSwarm] window.onerror:</b><br/>';
+			report = document.createElement( "div" );
+			report.innerHTML = "<hr/><b>[TestSwarm] window.onerror:</b><br/>";
 			report.appendChild( document.createTextNode( error ) );
-			report.appendChild( document.createElement( 'br' ) );
-			report.appendChild( document.createTextNode( 'in ' + filePath + ' on line ' + linerNr ) );
+			report.appendChild( document.createElement( "br" ) );
+			report.appendChild( document.createTextNode( "in " + filePath + " on line " + linerNr ) );
 			document.body.appendChild( report );
 			submit({ fail: 0, error: 1, total: 1 });
 
@@ -201,16 +200,16 @@
 	// Expose the TestSwarm API
 	window.TestSwarm = {
 		submit: submit,
-		heartbeat: function () {
+		heartbeat: function() {
 			if ( curHeartbeat ) {
 				clearTimeout( curHeartbeat );
 			}
 
-			curHeartbeat = setTimeout(function () {
+			curHeartbeat = setTimeout(function() {
 				submit({ fail: -1, total: -1 });
 			}, beatRate * 1000);
 		},
-		serialize: function () {
+		serialize: function() {
 			return trimSerialize();
 		}
 	};
@@ -218,12 +217,12 @@
 	testFrameworks = {
 		// QUnit (by jQuery)
 		// http://docs.jquery.com/QUnit
-		'QUnit': {
-			detect: function () {
-				return typeof QUnit !== 'undefined';
+		"QUnit": {
+			detect: function() {
+				return typeof QUnit !== "undefined";
 			},
-			install: function () {
-				QUnit.done(function ( results ) {
+			install: function() {
+				QUnit.done(function( results ) {
 					submit({
 						fail: results.failed,
 						error: 0,
@@ -234,13 +233,13 @@
 				QUnit.log = window.TestSwarm.heartbeat;
 				window.TestSwarm.heartbeat();
 
-				window.TestSwarm.serialize = function () {
+				window.TestSwarm.serialize = function() {
 					var ol, i;
 
 					// Show any collapsed results
-					ol = document.getElementsByTagName( 'ol' );
+					ol = document.getElementsByTagName( "ol" );
 					for ( i = 0; i < ol.length; i += 1 ) {
-						ol[i].style.display = 'block';
+						ol[i].style.display = "block";
 					}
 
 					return trimSerialize();
@@ -250,28 +249,28 @@
 
 		// UnitTestJS (Prototype, Scriptaculous)
 		// https://github.com/tobie/unittest_js
-		'UnitTestJS': {
-			detect: function () {
-				return typeof Test !== 'undefined' && Test && Test.Unit && Test.Unit.runners;
+		"UnitTestJS": {
+			detect: function() {
+				return typeof Test !== "undefined" && Test && Test.Unit && Test.Unit.runners;
 			},
-			install: function () {
+			install: function() {
 				/*jshint loopfunc:true */
-				var total_runners = Test.Unit.runners.length,
+				var i,
+					total_runners = Test.Unit.runners.length,
 					cur_runners = 0,
 					total = 0,
 					fail = 0,
-					error = 0,
-					i;
+					error = 0;
 
 				for ( i = 0; i < Test.Unit.runners.length; i += 1 ) {
 					// Need to proxy the i variable into a local scope,
 					// otherwise all the finish-functions created in this loop
 					// will refer to the same i variable..
-					(function ( i ) {
-						var finish, results;
+					(function( i ) {
+						var results,
+							finish = Test.Unit.runners[i].finish;
 
-						finish = Test.Unit.runners[i].finish;
-						Test.Unit.runners[i].finish = function () {
+						Test.Unit.runners[i].finish = function() {
 							finish.call( this );
 
 							results = this.getResult();
@@ -296,20 +295,20 @@
 		// JSSpec (MooTools)
 		// http://jania.pe.kr/aw/moin.cgi/JSSpec
 		// https://code.google.com/p/jsspec/
-		'JSSpec': {
-			detect: function () {
-				return typeof JSSpec !== 'undefined' && JSSpec && JSSpec.Logger;
+		"JSSpec": {
+			detect: function() {
+				return typeof JSSpec !== "undefined" && JSSpec && JSSpec.Logger;
 			},
-			install: function () {
+			install: function() {
 				var onRunnerEnd = JSSpec.Logger.prototype.onRunnerEnd;
-				JSSpec.Logger.prototype.onRunnerEnd = function () {
+				JSSpec.Logger.prototype.onRunnerEnd = function() {
 					var ul, i;
 					onRunnerEnd.call( this );
 
 					// Show any collapsed results
-					ul = document.getElementsByTagName( 'ul' );
+					ul = document.getElementsByTagName( "ul" );
 					for ( i = 0; i < ul.length; i += 1 ) {
-						ul[i].style.display = 'block';
+						ul[i].style.display = "block";
 					}
 
 					submit({
@@ -319,12 +318,12 @@
 					});
 				};
 
-				window.TestSwarm.serialize = function () {
-					var ul, i;
+				window.TestSwarm.serialize = function() {
+					var i,
+						ul = document.getElementsByTagName( "ul" );
 					// Show any collapsed results
-					ul = document.getElementsByTagName( 'ul' );
 					for ( i = 0; i < ul.length; i += 1 ) {
-						ul[i].style.display = 'block';
+						ul[i].style.display = "block";
 					}
 
 					return trimSerialize();
@@ -336,13 +335,13 @@
 		// http://www.jsunit.net/
 		// Note: Injection file must be included before the frames
 		// are document.write()d into the page.
-		'JSUnit': {
-			detect: function () {
-				return typeof JsUnitTestManager !== 'undefined';
+		"JSUnit": {
+			detect: function() {
+				return typeof JsUnitTestManager !== "undefined";
 			},
-			install: function () {
+			install: function() {
 				var _done = JsUnitTestManager.prototype._done;
-				JsUnitTestManager.prototype._done = function () {
+				JsUnitTestManager.prototype._done = function() {
 					_done.call( this );
 
 					submit({
@@ -352,21 +351,21 @@
 					});
 				};
 
-				window.TestSwarm.serialize = function () {
-					return '<pre>' + this.log.join( '\n' ) + '</pre>';
+				window.TestSwarm.serialize = function() {
+					return "<pre>" + this.log.join( "\n" ) + "</pre>";
 				};
 			}
 		},
 
 		// Selenium Core
 		// http://seleniumhq.org/projects/core/
-		'Selenium': {
-			detect: function () {
-				return typeof SeleniumTestResult !== 'undefined' && typeof LOG !== 'undefined';
+		"Selenium": {
+			detect: function() {
+				return typeof SeleniumTestResult !== "undefined" && typeof LOG !== "undefined";
 			},
-			install: function () {
+			install: function() {
 				// Completely overwrite the postback
-				SeleniumTestResult.prototype.post = function () {
+				SeleniumTestResult.prototype.post = function() {
 					submit({
 						fail: this.metrics.numCommandFailures,
 						error: this.metrics.numCommandErrors,
@@ -374,27 +373,29 @@
 					});
 				};
 
-				window.TestSwarm.serialize = function () {
-					var results = [], msg;
+				window.TestSwarm.serialize = function() {
+					var msg,
+						results = [];
 					while ( LOG.pendingMessages.length ) {
 						msg = LOG.pendingMessages.shift();
-						results.push( msg.type + ': ' + msg.msg );
+						results.push( msg.type + ": " + msg.msg );
 					}
 
-					return '<pre>' + results.join( '\n' ) + '</pre>';
+					return "<pre>" + results.join( "\n" ) + "</pre>";
 				};
 			}
 		},
 
 		// Dojo Objective Harness
 		// http://docs.dojocampus.org/quickstart/doh
-		'DOH': {
-			detect: function () {
-				return typeof doh !== 'undefined' && doh._report;
+		"DOH": {
+			detect: function() {
+				return typeof doh !== "undefined" && doh._report;
 			},
-			install: function () {
+			install: function() {
 				var _report = doh._report;
-				doh._report = function () {
+
+				doh._report = function() {
 					_report.apply( this, arguments );
 
 					submit({
@@ -404,22 +405,23 @@
 					});
 				};
 
-				window.TestSwarm.serialize = function () {
-					return '<pre>' + document.getElementById( 'logBody' ).innerHTML + '</pre>';
+				window.TestSwarm.serialize = function() {
+					return "<pre>" + document.getElementById( "logBody" ).innerHTML + "</pre>";
 				};
 			}
 		},
 
 		// Screw.Unit
 		// https://github.com/nathansobo/screw-unit
-		'Screw.Unit': {
-			detect: function () {
-				return typeof Screw !== 'undefined' && typeof jQuery !== 'undefined' && Screw && Screw.Unit;
+		"Screw.Unit": {
+			detect: function() {
+				return typeof Screw !== "undefined" && typeof jQuery !== "undefined" && Screw && Screw.Unit;
 			},
-			install: function () {
-				$(Screw).bind( 'after', function () {
-					var	passed = $( '.passed' ).length,
-						failed = $( '.failed' ).length;
+			install: function() {
+				/*global $ */
+				$( Screw ).bind( "after", function() {
+					var	passed = $( ".passed" ).length,
+						failed = $( ".failed" ).length;
 					submit({
 						fail: failed,
 						error: 0,
@@ -427,14 +429,14 @@
 					});
 				});
 
-				$( Screw ).bind( 'loaded', function () {
-					$( '.it' )
-						.bind( 'passed', window.TestSwarm.heartbeat )
-						.bind( 'failed', window.TestSwarm.heartbeat );
+				$( Screw ).bind( "loaded", function() {
+					$( ".it" )
+						.bind( "passed", window.TestSwarm.heartbeat )
+						.bind( "failed", window.TestSwarm.heartbeat );
 					window.TestSwarm.heartbeat();
 				});
 
-				window.TestSwarm.serialize = function () {
+				window.TestSwarm.serialize = function() {
 					return trimSerialize();
 				};
 			}
@@ -442,24 +444,24 @@
 
 		// Mocha
 		// http://visionmedia.github.com/mocha/
-		'Mocha': {
-			detect: function () {
-				return typeof Mocha !== 'undefined' && typeof mocha !== 'undefined';
+		"Mocha": {
+			detect: function() {
+				return typeof Mocha !== "undefined" && typeof mocha !== "undefined";
 			},
-			install: function () {
+			install: function() {
 				// Tab into the run method to install our hooks.
 				// Use the mocha instance instead of the prototype, because
 				// the mocha instance (HTMLReporter) also overloads .run.
 				// This ensures our code runs after HTMLReporter is done.
 				var run = mocha.run;
-				mocha.run = function (fn) {
+				mocha.run = function(fn) {
 					var runner;
 
 					// Sometimes (in IE9?) the 'end' event has already fired.
-					// Registering on('end', fn) afterwards doesn't work.
+					// Registering on("end", fn) afterwards doesn't work.
 					// So we use the .run(fn) callback instead, which is called
 					// internally by Mocha right after the 'end' event.
-					runner = run.call(this, function () {
+					runner = run.call(this, function() {
 						if (fn) {
 							// Call the original callback given to .run(fn)
 							fn.apply(this, arguments);
@@ -467,7 +469,7 @@
 						// `runner` can sometimes still be undefined here (at least in IE9).
 						// Let the function return and pick up asynchronously
 						// so the variable has been assigned.
-						setTimeout(function () {
+						setTimeout(function() {
 							submit({
 								fail: runner.failures,
 								total: runner.total,
@@ -476,22 +478,22 @@
 						}, 1);
 					});
 
-					runner.on('start', window.TestSwarm.heartbeat);
-					runner.on('suite', window.TestSwarm.heartbeat);
-					runner.on('test end', window.TestSwarm.heartbeat);
-					runner.on('pass', window.TestSwarm.heartbeat);
-					runner.on('fail', window.TestSwarm.heartbeat);
+					runner.on("start", window.TestSwarm.heartbeat);
+					runner.on("suite", window.TestSwarm.heartbeat);
+					runner.on("test end", window.TestSwarm.heartbeat);
+					runner.on("pass", window.TestSwarm.heartbeat);
+					runner.on("fail", window.TestSwarm.heartbeat);
 
 					return runner;
 				};
 
-				window.TestSwarm.serialize = function () {
+				window.TestSwarm.serialize = function() {
 					var i, len, els;
-					els = document.getElementsByTagName('pre');
+					els = document.getElementsByTagName("pre");
 					// Expand all source code sections, because we submit a static
-					// snapshot to TestSwarm, event handlers don't survive.
+					// snapshot to TestSwarm, event handlers don"t survive.
 					for ( i = 0, len = els.length; i < len; i++ ) {
-						els[i].style.display = 'inline-block';
+						els[i].style.display = "inline-block";
 					}
 					return trimSerialize();
 				};
diff --git a/js/job.js b/js/job.js
index 40275b67..bd3c8857 100644
--- a/js/job.js
+++ b/js/job.js
@@ -1,34 +1,35 @@
 /**
  * JavaScript file for the "job" page in the browser.
  *
- * @author John Resig, 2008-2011
+ * @author John Resig
+ * @author Timo Tijhof
  * @since 0.1.0
  * @package TestSwarm
  */
-jQuery(function ( $ ) {
+jQuery(function( $ ) {
 	var updateInterval = SWARM.conf.web.ajaxUpdateInterval * 1000,
-		$wipejobErr = $( '.swarm-wipejob-error' ),
-		$targetTable = $( 'table.swarm-results' ),
+		$wipejobErr = $( ".swarm-wipejob-error" ),
+		$targetTable = $( "table.swarm-results" ),
 		refreshTableTimout, indicatorText, $indicator;
 
-	indicatorText = document.createTextNode( 'updating' );
-	$indicator = $( '<span class="btn pull-right disabled"> <i class="icon-refresh"></i></span>' )
+	indicatorText = document.createTextNode( "updating" );
+	$indicator = $( "<span class='btn pull-right disabled'> <i class='icon-refresh'></i></span>" )
 		.prepend( indicatorText )
-		.css( 'opacity', 0 );
+		.css( "opacity", 0 );
 
 	function indicateAction( label ) {
-		// Make sure any scheduled action is dequeued, we're doing something now.
+		// Make sure any scheduled action is dequeued, we"re doing something now.
 		if ( refreshTableTimout ) {
 			clearTimeout( refreshTableTimout );
 		}
 		// $.text() is a getter
 		// $.fn.text() does empty/append, which means the reference is no meaningless
 		indicatorText.nodeValue = label;
-		$indicator.stop( true, true ).css( 'opacity', 1 );
+		$indicator.stop( true, true ).css( "opacity", 1 );
 	}
 
 	function actionComplete() {
-		setTimeout( function () {
+		setTimeout( function() {
 			$indicator.stop(true, true).animate({
 				opacity: 0
 			});
@@ -36,18 +37,18 @@ jQuery(function ( $ ) {
 	}
 
 	function refreshTable() {
-		indicateAction( 'updating' );
+		indicateAction( "updating" );
 
 		$.get( window.location.href )
-			.done( function ( html ) {
+			.done( function( html ) {
 				var tableHtml;
 
-				tableHtml = $( html ).find( 'table.swarm-results' ).html();
+				tableHtml = $( html ).find( "table.swarm-results" ).html();
 				if ( tableHtml !== $targetTable.html() ) {
 					$targetTable.html( tableHtml );
 				}
 			})
-			.complete( function () {
+			.complete( function() {
 				// Wether done or failed: Clean up and schedule next update
 				actionComplete();
 				refreshTableTimout = setTimeout( refreshTable, updateInterval );
@@ -58,27 +59,27 @@ jQuery(function ( $ ) {
 	refreshTableTimout = setTimeout( refreshTable, updateInterval );
 
 	function wipejobFail( data ) {
-		$wipejobErr.hide().text( data.error && data.error.info || 'Action failed.' ).slideDown();
+		$wipejobErr.hide().text( data.error && data.error.info || "Action failed." ).slideDown();
 	}
 
 	function resetRun( $el ) {
-		if ( $el.data( 'runStatus' ) !== 'new' ) {
+		if ( $el.data( "runStatus" ) !== "new" ) {
 			$.ajax({
-				url: SWARM.conf.web.contextpath + 'api.php',
-				type: 'POST',
+				url: SWARM.conf.web.contextpath + "api.php",
+				type: "POST",
 				data: {
-					action: 'wiperun',
-					job_id: $el.data( 'jobId' ),
-					run_id: $el.data( 'runId' ),
-					client_id: $el.data( 'clientId' ),
-					useragent_id: $el.data( 'useragentId' ),
+					action: "wiperun",
+					job_id: $el.data( "jobId" ),
+					run_id: $el.data( "runId" ),
+					client_id: $el.data( "clientId" ),
+					useragent_id: $el.data( "useragentId" ),
 					authID: SWARM.auth.project.id,
 					authToken: SWARM.auth.sessionToken
 				},
-				dataType: 'json',
-				success: function ( data ) {
-					if ( data.wiperun && data.wiperun.result === 'ok' ) {
-						$el.empty().attr( 'class', 'swarm-status swarm-status-new' );
+				dataType: "json",
+				success: function( data ) {
+					if ( data.wiperun && data.wiperun.result === "ok" ) {
+						$el.empty().attr( "class", "swarm-status swarm-status-new" );
 						refreshTable();
 					}
 				}
@@ -86,91 +87,91 @@ jQuery(function ( $ ) {
 		}
 	}
 
-	$( 'table.swarm-results' ).prev().before( $indicator );
+	$( "table.swarm-results" ).prev().before( $indicator );
 
 	if ( SWARM.auth ) {
 
 		// This needs to bound as a delegate, because the table auto-refreshes.
-		$targetTable.on( 'click', '.swarm-reset-run-single', function () {
-			resetRun( $( this ).closest( 'td' ) );
+		$targetTable.on( "click", ".swarm-reset-run-single", function() {
+			resetRun( $( this ).closest( "td" ) );
 		});
 
-		$( '.swarm-reset-runs-failed' ).on( 'click', function () {
-			var $els = $( 'td[data-run-status="failed"], td[data-run-status="error"], td[data-run-status="timedout"]' );
-			if ( !$els.length || !window.confirm( 'Are you sure you want to reset all failed runs?' ) ) {
+		$( ".swarm-reset-runs-failed" ).on( "click", function() {
+			var $els = $( "td[data-run-status='failed'], td[data-run-status='error'], td[data-run-status='timedout']" );
+			if ( !$els.length || !window.confirm( "Are you sure you want to reset all failed runs?" ) ) {
 				return;
 			}
-			$els.each( function () {
+			$els.each( function() {
 				resetRun( $( this ) );
 			});
 		});
-		$( '.swarm-delete-job' ).click( function () {
-			if ( !window.confirm( 'Are you sure you want to delete this job?' ) ) {
+		$( ".swarm-delete-job" ).click( function() {
+			if ( !window.confirm( "Are you sure you want to delete this job?" ) ) {
 				return;
 			}
 			$wipejobErr.hide();
-			indicateAction( 'deleting' );
+			indicateAction( "deleting" );
 
 			$.ajax({
-				url: SWARM.conf.web.contextpath + 'api.php',
-				type: 'POST',
+				url: SWARM.conf.web.contextpath + "api.php",
+				type: "POST",
 				data: {
-					action: 'wipejob',
+					action: "wipejob",
 					job_id: SWARM.jobInfo.id,
-					type: 'delete',
+					type: "delete",
 					authID: SWARM.auth.project.id,
 					authToken: SWARM.auth.sessionToken
 				},
-				dataType: 'json',
-				success: function ( data ) {
-					if ( data.wipejob && data.wipejob.result === 'ok' ) {
+				dataType: "json",
+				success: function( data ) {
+					if ( data.wipejob && data.wipejob.result === "ok" ) {
 						// Right now the only user authorized to delete a job is the creator,
 						// the below code makes that assumption.
-						window.location.href = SWARM.conf.web.contextpath + 'project/' + SWARM.auth.project.id;
+						window.location.href = SWARM.conf.web.contextpath + "project/" + SWARM.auth.project.id;
 						return;
 					}
 					actionComplete();
 					wipejobFail( data );
 				},
-				error: function ( error ) {
+				error: function( error ) {
 					actionComplete();
 					wipejobFail( error );
 				}
 			});
-		} );
+		});
 
-		$( '.swarm-reset-runs' ).click( function () {
-			if ( !window.confirm( 'Are you sure you want to reset this job?' ) ) {
+		$( ".swarm-reset-runs" ).click( function() {
+			if ( !window.confirm( "Are you sure you want to reset this job?" ) ) {
 				return;
 			}
 			$wipejobErr.hide();
-			indicateAction( 'resetting' );
+			indicateAction( "resetting" );
 
 			$.ajax({
-				url: SWARM.conf.web.contextpath + 'api.php',
-				type: 'POST',
+				url: SWARM.conf.web.contextpath + "api.php",
+				type: "POST",
 				data: {
-					action: 'wipejob',
+					action: "wipejob",
 					job_id: SWARM.jobInfo.id,
-					type: 'reset',
+					type: "reset",
 					authID: SWARM.auth.project.id,
 					authToken: SWARM.auth.sessionToken
 				},
-				dataType: 'json',
-				success: function ( data ) {
+				dataType: "json",
+				success: function( data ) {
 					actionComplete();
-					if ( data.wipejob && data.wipejob.result === 'ok' ) {
+					if ( data.wipejob && data.wipejob.result === "ok" ) {
 						refreshTable();
 						return;
 					}
 					wipejobFail( data );
 				},
-				error: function ( error ) {
+				error: function( error ) {
 					actionComplete();
 					wipejobFail( error );
 				}
 			});
-		} );
+		});
 
 	}
 
diff --git a/js/pretty.js b/js/pretty.js
index d62bf795..a2ea47b7 100644
--- a/js/pretty.js
+++ b/js/pretty.js
@@ -29,26 +29,26 @@ function prettyDate( time ) {
 	}
 
 	return day_diff === 0 && (
-		diff < 3 && 'just now' ||
-		diff < 60 && Math.floor( diff ) + ' seconds ago' ||
-			diff < 120 && '1 minute ago' ||
-				diff < 3600 && Math.floor( diff / 60 ) + ' minutes ago' ||
-					diff < 7200 && '1 hour ago' ||
-						diff < 86400 && Math.floor( diff / 3600 ) + ' hours ago'
+		diff < 3 && "just now" ||
+		diff < 60 && Math.floor( diff ) + " seconds ago" ||
+			diff < 120 && "1 minute ago" ||
+				diff < 3600 && Math.floor( diff / 60 ) + " minutes ago" ||
+					diff < 7200 && "1 hour ago" ||
+						diff < 86400 && Math.floor( diff / 3600 ) + " hours ago"
 	) ||
-		day_diff === 1 && 'Yesterday' ||
-		day_diff < 7 && day_diff + ' days ago' ||
-		day_diff < 31 && Math.ceil( day_diff / 7 ) + ' weeks ago';
+		day_diff === 1 && "Yesterday" ||
+		day_diff < 7 && day_diff + " days ago" ||
+		day_diff < 31 && Math.ceil( day_diff / 7 ) + " weeks ago";
 }
 
 // If jQuery is included in the page, adds a jQuery plugin to handle it as well
-if ( typeof jQuery !== 'undefined' ) {
-	jQuery.fn.prettyDate = function () {
-		return this.each( function () {
+if ( typeof jQuery !== "undefined" ) {
+	jQuery.fn.prettyDate = function() {
+		return this.each(function() {
 			var date = prettyDate( this.title );
 			if ( date ) {
 				jQuery( this ).text( date );
 			}
-		} );
+		});
 	};
 }
diff --git a/js/result.js b/js/result.js
index c83812b8..9c7e1a1e 100644
--- a/js/result.js
+++ b/js/result.js
@@ -1,32 +1,32 @@
 /**
  * JavaScript file for the "result" page in the browser.
  *
- * @author Timo Tijhof, 2012
+ * @author Timo Tijhof
  * @since 1.0
  * @package TestSwarm
  */
-jQuery(function ( $ ) {
+jQuery(function( $ ) {
 
 	// Even-out scrollbars
-	$( '.swarm-result-frame' ).on( 'load', function () {
+	$( ".swarm-result-frame" ).on( "load", function() {
 		var frame = this, frameDoc = frame.contentWindow.document;
-		setTimeout( function () {
+		setTimeout( function() {
 			frame.height = frameDoc.height;
 		}, 50);
 	});
 
 	// Popup links
-	$( '.swarm-popuplink' ).on( 'click', function ( e ) {
-		window.open( this.href, '_blank', [
-			'menubar=no',
-			'toolbar=no',
-			'location=yes',
-			'personalbar=no',
-			'status=yes',
-			'resizable=yes',
-			'scrollbars=yes',
-			'minimizable=yes'
-		].join(',') );
+	$( ".swarm-popuplink" ).on( "click", function( e ) {
+		window.open( this.href, "_blank", [
+			"menubar=no",
+			"toolbar=no",
+			"location=yes",
+			"personalbar=no",
+			"status=yes",
+			"resizable=yes",
+			"scrollbars=yes",
+			"minimizable=yes"
+		].join( "," ) );
 		e.preventDefault();
 	});
 
diff --git a/js/run.js b/js/run.js
index c68f9f2a..59f47f8d 100644
--- a/js/run.js
+++ b/js/run.js
@@ -1,22 +1,22 @@
 /**
  * JavaScript file for the "run" page in the browser.
  *
- * @author John Resig, 2008-2011
- * @author Timo Tijhof, 2012
+ * @author John Resig
+ * @author Timo Tijhof
  * @since 0.1.0
  * @package TestSwarm
  */
-(function ( $, SWARM, undefined ) {
+(function( $, SWARM, undefined ) {
 	var currRunId, currRunUrl, testTimeout, pauseTimer, cmds, errorOut;
 
 	function msg( htmlMsg ) {
-		$( '#msg' ).html( htmlMsg );
+		$( "#msg" ).html( htmlMsg );
 	}
 
 	function log( htmlMsg ) {
-		$( '#history' ).prepend( '<li><strong>' +
-			new Date().toString().replace( /^\w+ /, '' ).replace( /:[^:]+$/, '' ) +
-			':</strong> ' + htmlMsg + '</li>'
+		$( "#history" ).prepend( "<li><strong>" +
+			new Date().toString().replace( /^\w+ /, "" ).replace( /:[^:]+$/, "" ) +
+			":</strong> " + htmlMsg + "</li>"
 		);
 
 		msg( htmlMsg );
@@ -26,15 +26,15 @@
 	 * Softly validate the SWARM object
 	 */
 	if ( !SWARM.client_id || !SWARM.conf ) {
-		$( function () {
-			msg( 'Error: No client id configured! Aborting.' );
+		$( function() {
+			msg( "Error: No client id configured! Aborting." );
 		});
 		return;
 	}
 
 	errorOut = 0;
 	cmds = {
-		reload: function () {
+		reload: function() {
 			window.location.reload();
 		}
 	};
@@ -50,20 +50,20 @@
 					cmds.reload();
 				} else {
 					errorOut += 1;
-					errMsg = errMsg ? (' (' + errMsg + ')') : '';
-					msg( 'Error connecting to server' + errMsg + ', retrying...' );
+					errMsg = errMsg ? (" (" + errMsg + ")") : "";
+					msg( "Error connecting to server" + errMsg + ", retrying..." );
 					setTimeout( retry, SWARM.conf.client.saveRetrySleep * 1000 );
 				}
 		}
 
 		$.ajax({
-			type: 'POST',
-			url: SWARM.conf.web.contextpath + 'api.php',
+			type: "POST",
+			url: SWARM.conf.web.contextpath + "api.php",
 			timeout: SWARM.conf.client.saveReqTimeout * 1000,
 			cache: false,
 			data: query,
-			dataType: 'json',
-			success: function ( data ) {
+			dataType: "json",
+			success: function( data ) {
 				if ( !data || data.error ) {
 					error( data.error.info );
 				} else {
@@ -71,7 +71,7 @@
 					ok.apply( this, arguments );
 				}
 			},
-			error: function () {
+			error: function() {
 				error();
 			}
 		});
@@ -79,15 +79,15 @@
 
 	function getTests() {
 		if ( currRunId === undefined ) {
-			log( 'Connected to the swarm.' );
+			log( "Connected to the swarm." );
 		}
 
 		currRunId = 0;
 		currRunUrl = false;
 
-		msg( 'Querying for tests to run...' );
+		msg( "Querying for tests to run..." );
 		retrySend( {
-			action: 'getrun',
+			action: "getrun",
 			client_id: SWARM.client_id,
 			run_token: SWARM.run_token
 		}, getTests, runTests );
@@ -99,30 +99,30 @@
 			testTimeout = 0;
 		}
 
-		$( 'iframe' ).remove();
+		$( "iframe" ).remove();
 	}
 
 	function testTimedout( runInfo ) {
 		cancelTest();
 		retrySend(
 			{
-				action: 'saverun',
+				action: "saverun",
 				fail: 0,
 				error: 0,
 				total: 0,
 				status: 3, // ResultAction::STATE_ABORTED
-				report_html: 'Test Timed Out.',
+				report_html: "Test Timed Out.",
 				run_id: currRunId,
 				client_id: SWARM.client_id,
 				run_token: SWARM.run_token,
 				results_id: runInfo.resultsId,
 				results_store_token: runInfo.resultsStoreToken
 			},
-			function () {
+			function() {
 				testTimedout( runInfo );
 			},
-			function ( data ) {
-				if ( data.saverun === 'ok' ) {
+			function( data ) {
+				if ( data.saverun === "ok" ) {
 					SWARM.runDone();
 				} else {
 					getTests();
@@ -135,14 +135,14 @@
 	 * @param data Object: Reponse from api.php?action=getrun
 	 */
 	function runTests( data ) {
-		var norun_msg, timeLeft, runInfo, params, iframe;
+		var norun_msg, timeLeft, runInfo, iframe;
 
 		if ( !$.isPlainObject( data ) || data.error ) {
 			// Handle session timeout, where server sends back "Username required."
 			// Handle TestSwarm reset, where server sends back "Client doesn't exist."
 			if ( data.error ) {
-				$(function () {
-					msg( 'action=getrun failed. ' + $( '<div>' ).text( data.error.info ).html() );
+				$(function() {
+					msg( "action=getrun failed. " + $( "<div>" ).text( data.error.info ).html() );
 				});
 				return;
 			}
@@ -156,18 +156,18 @@
 				currRunId = runInfo.id;
 				currRunUrl = runInfo.url;
 
-				log( 'Running ' + ( runInfo.desc || '' ) + ' tests...' );
+				log( "Running " + ( runInfo.desc || "" ) + " tests..." );
 
-				iframe = document.createElement( 'iframe' );
+				iframe = document.createElement( "iframe" );
 				iframe.width = 1000;
 				iframe.height = 600;
-				iframe.className = 'test-runner-frame';
-				iframe.src = currRunUrl + (currRunUrl.indexOf( '?' ) > -1 ? '&' : '?') + $.param({
+				iframe.className = "test-runner-frame";
+				iframe.src = currRunUrl + (currRunUrl.indexOf( "?" ) > -1 ? "&" : "?") + $.param({
 					// Cache buster
-					'_' : new Date().getTime(),
+					"_" : new Date().getTime(),
 					// Homing signal for inject.js so that it can find its target for action=saverun
-					'swarmURL' : window.location.protocol + '//' + window.location.host + SWARM.conf.web.contextpath +
-						'index.php?' +
+					"swarmURL" : window.location.protocol + "//" + window.location.host + SWARM.conf.web.contextpath +
+						"index.php?" +
 						$.param({
 							status: 2, // ResultAction::STATE_FINISHED
 							run_id: currRunId,
@@ -178,10 +178,10 @@
 						})
 				});
 
-				$( '#iframes' ).append( iframe );
+				$( "#iframes" ).append( iframe );
 
 				// Timeout after a period of time
-				testTimeout = setTimeout( function () {
+				testTimeout = setTimeout( function() {
 					testTimedout( runInfo );
 				}, SWARM.conf.client.runTimeout * 1000 );
 
@@ -195,7 +195,7 @@
 		// optionally replacing the message by data.timeoutMsg
 		clearTimeout( pauseTimer );
 
-		norun_msg = data.timeoutMsg || 'No new tests to run.';
+		norun_msg = data.timeoutMsg || "No new tests to run.";
 
 		msg( norun_msg );
 
@@ -204,7 +204,7 @@
 		timeLeft = currRunUrl ? SWARM.conf.client.cooldownSleep : SWARM.conf.client.nonewrunsSleep;
 
 		pauseTimer = setTimeout(function leftTimer() {
-			msg(norun_msg + ' Getting more in ' + timeLeft + ' seconds.' );
+			msg(norun_msg + " Getting more in " + timeLeft + " seconds." );
 			if ( timeLeft >= 1 ) {
 				timeLeft -= 1;
 				pauseTimer = setTimeout( leftTimer, 1000 );
@@ -220,31 +220,31 @@
 	// so that when inject.js does a <form> submission,
 	// it can call this from within the frame
 	// as window.parent.SWARM.runDone();
-	SWARM.runDone = function () {
+	SWARM.runDone = function() {
 		cancelTest();
-		runTests({ timeoutMsg: 'Cooling down.' });
+		runTests({ timeoutMsg: "Cooling down." });
 	};
 
 	function handleMessage(e) {
 		e = e || window.event;
-		retrySend( e.data, function () {
+		retrySend( e.data, function() {
 			handleMessage(e);
 		}, SWARM.runDone );
 	}
 
 	function confUpdate() {
 		$.ajax({
-			type: 'POST',
-			url: SWARM.conf.web.contextpath + 'api.php',
+			type: "POST",
+			url: SWARM.conf.web.contextpath + "api.php",
 			timeout: SWARM.conf.client.saveReqTimeout * 1000,
 			cache: false,
 			data: {
-				action: 'ping',
+				action: "ping",
 				client_id: SWARM.client_id,
 				run_token: SWARM.run_token
 			},
-			dataType: 'json'
-		}).done( function ( data ) {
+			dataType: "json"
+		}).done( function( data ) {
 			// Handle configuration update
 			if ( data.ping && data.ping.confUpdate ) {
 				// Refresh control
@@ -255,7 +255,7 @@
 
 				$.extend( SWARM.conf, data.ping.confUpdate );
 			}
-		}).always( function () {
+		}).always( function() {
 			setTimeout( confUpdate, SWARM.conf.client.pingTime * 1000 );
 		});
 	}
@@ -265,12 +265,12 @@
 	 * Bind
 	 */
 	if ( window.addEventListener ) {
-		window.addEventListener( 'message', handleMessage, false );
+		window.addEventListener( "message", handleMessage, false );
 	} else if ( window.attachEvent ) {
-		window.attachEvent( 'onmessage', handleMessage );
+		window.attachEvent( "onmessage", handleMessage );
 	}
 
-	$( function () {
+	$( function() {
 		getTests();
 		confUpdate();
 	});
diff --git a/js/testswarm.js b/js/testswarm.js
index 19e9476b..5c6b2311 100644
--- a/js/testswarm.js
+++ b/js/testswarm.js
@@ -1,71 +1,71 @@
 /**
- * JavaScript file for all Pages.
+ * JavaScript file for all pages.
  *
- * @author John Resig, 2008-2011
- * @author Timo Tijhof, 2012
+ * @author John Resig
+ * @author Timo Tijhof
  * @since 0.1.0
  * @package TestSwarm
  */
-jQuery(function ( $ ) {
+jQuery(function( $ ) {
 	var query = {},
 		search = window.location.search;
 
-	// Skip leading '?'
+	// Skip leading "?""
 	if ( search.length > 1 ) {
-		$.each( search.slice( 1 ).split( '&' ), function ( i, parts ) {
-			parts = parts.replace( /^([^=]+)=(.*)$/, function ( p0, p1, p2 ) {
+		$.each( search.slice( 1 ).split( "&" ), function( i, parts ) {
+			parts = parts.replace( /^([^=]+)=(.*)$/, function( p0, p1, p2 ) {
 				query[ decodeURIComponent( p1 ) ] = decodeURIComponent( p2 );
-			} );
+			});
 		});
 	}
 
 	if ( $.fn.prettyDate ) {
-		$( '.pretty' ).prettyDate();
+		$( ".pretty" ).prettyDate();
 	}
 
 	if ( SWARM.auth ) {
-		$( '.swarm-logout-link' ).on( 'click', function ( e ) {
-			$( '<form>', {
+		$( ".swarm-logout-link" ).on( "click", function( e ) {
+			$( "<form>", {
 				action: SWARM.conf.web.contextpath,
-				method: 'POST',
-				css: { display: 'none' }
+				method: "POST",
+				css: { display: "none" }
 			})
 			.append(
-				$( '<input type="hidden"/>' ).prop({ name: 'action', value: 'logout' }),
-				$( '<input type="hidden"/>' ).prop({ name: 'authID', value: SWARM.auth.project.id }),
-				$( '<input type="hidden"/>' ).prop({ name: 'authToken', value: SWARM.auth.sessionToken })
+				$( "<input type='hidden'/>" ).prop({ name: "action", value: "logout" }),
+				$( "<input type='hidden'/>" ).prop({ name: "authID", value: SWARM.auth.project.id }),
+				$( "<input type='hidden'/>" ).prop({ name: "authToken", value: SWARM.auth.sessionToken })
 			)
-			.appendTo( 'body' )
+			.appendTo( "body" )
 			.submit();
 
 			e.preventDefault();
 		});
 	}
 
-	$( '.swarm-form-join [name="item"]' ).each( function () {
+	$( ".swarm-form-join [name='item']" ).each( function() {
 		var el = this;
-		$( el ).on( 'input change', function () {
+		$( el ).on( "input change", function() {
 			if ( el.value && el.checkValidity && !el.checkValidity() && el.setCustomValidity ) {
 				// Override the error message that is displayed when the field is non-empty
 				// and didn't pass validation, defaults to "Did not match pattern" which is not
 				// useful as the user doesn't know the pattern.
 				el.setCustomValidity(
-					'Names should be no longer than 128 characters.'
+					"Names should be no longer than 128 characters."
 				);
 			} else {
-				el.setCustomValidity( '' );
+				el.setCustomValidity( "" );
 			}
 		});
-		$([ el, el.form ]).on( 'blur submit', function () {
+		$([ el, el.form ]).on( "blur submit", function() {
 			if ( !el.value ) {
-				el.value = 'anonymous';
+				el.value = "anonymous";
 			}
 		});
-	} );
+	});
 
-	$( document ).on( 'click', '.swarm-toggle', function () {
+	$( document ).on( "click", ".swarm-toggle", function() {
 		var key,
-			toggleQuery = $( this ).data( 'toggle-query' );
+			toggleQuery = $( this ).data( "toggle-query" );
 		for ( key in toggleQuery ) {
 			if ( query[key] !== undefined && ( toggleQuery[key] === null || toggleQuery[key] === null ) ) {
 				delete query[key];
@@ -73,6 +73,6 @@ jQuery(function ( $ ) {
 				query[key] = toggleQuery[key];
 			}
 		}
-		window.location.search = '?' + $.param( query );
+		window.location.search = "?" + $.param( query );
 	});
 });