Merge backlog of changes from master branch

This is too easy. I'm worried.
This commit is contained in:
Jeremy Ruston
2013-11-08 08:33:27 +00:00
38 changed files with 578 additions and 53 deletions
@@ -27,6 +27,7 @@ exports.startup = function() {
clearInterval: clearInterval,
setTimeout: setTimeout,
clearTimeout: clearTimeout,
exports: {},
$tw: $tw
});
// Prepare the Jasmine environment