diff --git a/.gitignore b/.gitignore
index 0bac695bd7..c6a3fe5a87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@
 \#*\#
 .\#*
 .idea
+*.iml
+*.sublime-project
+*.sublime-workspace
diff --git a/History.md b/History.md
index 0aca974501..60b71ec465 100644
--- a/History.md
+++ b/History.md
@@ -1,6 +1,81 @@
 
 ## vNEXT
 
+## v0.5.3
+
+* Add `--settings` argument to `meteor deploy` and `meteor run`. This
+  allows you to specify deployment-specific information made available
+  to server code in the variable `Meteor.settings`.
+
+* Support unlimited open tabs in a single browser. Work around the
+  browser per-hostname connection limit by using randomized hostnames
+  for deployed apps. #131
+
+* minimongo improvements:
+  * Allow observing cursors with `skip` or `limit`.  #528
+  * Allow sorting on `dotted.sub.keys`.  #533
+  * Allow querying specific array elements (`foo.1.bar`).
+  * `$and`, `$or`, and `$nor` no longer accept empty arrays (for consistency
+    with Mongo)
+
+* Re-rendering a template with Spark no longer reverts changes made by
+  users to a `preserve`d form element. Instead, the newly rendered value
+  is only applied if it is different from the previously rendered value.
+  Additionally, <INPUT> elements with type other than TEXT can now have
+  reactive values (eg, the labels on submit buttons can now be
+  reactive).  #510 #514 #523 #537 #558
+
+* Support JavaScript RegExp objects in selectors in Collection write
+  methods on the client, eg `myCollection.remove({foo: /bar/})`.  #346
+
+* `meteor` command-line improvements:
+  * Improve error message when mongod fails to start.
+  * The `NODE_OPTIONS` environment variable can be used to pass command-line
+    flags to node (eg, `--debug` or `--debug-brk` to enable the debugger).
+  * Die with error if an app name is mistakenly passed to `meteor reset`.
+
+* Add support for "offline" access tokens with Google login. #464 #525
+
+* Don't remove `serviceData` fields from previous logins when logging in
+  with an external service.
+
+* Improve `OAuth1Binding` to allow making authenticated API calls to
+  OAuth1 providers (eg Twitter).  #539
+
+* New login providers automatically work with `{{loginButtons}}` without
+  needing to edit the `accounts-ui-unstyled` package.  #572
+
+* Use `Content-Type: application/json` by default when sending JSON data
+  with `Meteor.http`.
+
+* Improvements to `jsparse`: hex literals, keywords as property names, ES5 line
+  continuations, trailing commas in object literals, line numbers in error
+  messages, decimal literals starting with `.`, regex character classes with
+  slashes.
+
+* Spark improvements:
+  * Improve rendering of <SELECT> elements on IE.  #496
+  * Don't lose nested data contexts in IE9/10 after two seconds.  #458
+  * Don't print a stack trace if DOM nodes are manually removed
+    from the document without calling `Spark.finalize`.  #392
+
+* Always use the `autoReconnect` flag when connecting to Mongo.  #425
+
+* Fix server-side `observe` with no `added` callback.  #589
+
+* Fix re-sending method calls on reconnect.  #538
+
+* Remove deprecated `/sockjs` URL support from `Meteor.connect`.
+
+* Avoid losing a few bits of randomness in UUID v4 creation.  #519
+
+* Update clean-css package from 0.8.2 to 0.8.3, fixing minification of `0%`
+  values in `hsl` colors.  #515
+
+Patches contributed by GitHub users Ed-von-Schleck, egtann, jwulf, lvbreda,
+martin-naumann, meawoppl, nwmartin, timhaines, and zealoushacker.
+
+
 ## v0.5.2
 
 * Fix 0.5.1 regression: Cursor `observe` works during server startup.  #507
diff --git a/admin/cli-test.sh b/admin/cli-test.sh
index 4b3b79446b..8f1b262b8f 100755
--- a/admin/cli-test.sh
+++ b/admin/cli-test.sh
@@ -1,9 +1,19 @@
 #!/bin/bash
 
-# NOTE: by default this tests the installed meteor, not the one in your
-# working copy.
+# NOTE: by default this tests the working copy, not the installed meteor.
+# To test the installed meteor, pass in --global
 
-METEOR=/usr/local/bin/meteor
+cd `dirname $0`
+METEOR=`pwd`/../meteor
+
+if [ -z "$NODE" ]; then
+    NODE=`pwd`/node.sh
+fi
+
+#If this ever takes more options, use getopt
+if [ "$1" == "--global" ]; then
+	METEOR=meteor
+fi
 
 DIR=`mktemp -d -t meteor-cli-test-XXXXXXXX`
 trap 'echo FAILED ; rm -rf "$DIR" >/dev/null 2>&1' EXIT
@@ -71,7 +81,8 @@ echo "... run"
 MONGOMARK='--bind_ip 127.0.0.1 --smallfiles --port 9102'
 # kill any old test meteor
 # there is probably a better way to do this, but it is at least portable across macos and linux
-ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill
+# (the || true is needed on linux, whose xargs will invoke kill even with no args)
+ps ax | grep -e 'meteor.js -p 9100' | grep -v grep | awk '{print $1}' | xargs kill || true
 
 ! $METEOR mongo > /dev/null 2>&1
 $METEOR reset > /dev/null 2>&1
@@ -83,7 +94,7 @@ PORT=9100
 $METEOR -p $PORT > /dev/null 2>&1 &
 METEOR_PID=$!
 
-sleep 1 # XXX XXX lame
+sleep 2 # XXX XXX lame
 
 test -d .meteor/local/db
 ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
@@ -105,16 +116,51 @@ echo "... rerun"
 $METEOR -p $PORT > /dev/null 2>&1 &
 METEOR_PID=$!
 
-sleep 1 # XXX XXX lame
+sleep 2 # XXX XXX lame
 
 ps ax | grep -e "$MONGOMARK" | grep -v grep > /dev/null
 curl -s "http://localhost:$PORT" > /dev/null
 
 kill $METEOR_PID
-ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill
+sleep 10 # XXX XXX lame. have to wait for inner app to die via keepalive!
 
+ps ax | grep -e "$MONGOMARK" | grep -v grep | awk '{print $1}' | xargs kill || true
+sleep 2 # need to make sure these kills take effect
 
+echo "... mongo message"
 
+# Run a server on the same port as mongod, so that mongod fails to start up. Rig
+# it so that a single connection will cause it to exit.
+$NODE -e 'require("net").createServer(function(){process.exit(0)}).listen('$PORT'+2, "127.0.0.1")' &
+
+sleep 1
+
+$METEOR -p $PORT > error.txt || true
+
+grep 'port was closed' error.txt > /dev/null
+
+# Kill the server by connecting to it.
+$NODE -e 'require("net").connect({host:"127.0.0.1",port:'$PORT'+2},function(){process.exit(0);})'
+
+echo "... settings"
+
+cat > settings.json <<EOF
+{ "foo" : "bar",
+  "baz" : "quux"
+}
+EOF
+
+cat > settings.js <<EOF
+if (Meteor.isServer) {
+  Meteor.startup(function () {
+    if (!Meteor.settings) process.exit(1);
+    if (Meteor.settings.foo !== "bar") process.exit(1);
+    process.exit(0);
+  });
+}
+EOF
+
+$METEOR -p $PORT --settings='settings.json' --once > /dev/null
 
 # XXX more tests here!
 
diff --git a/admin/copy-release-from-jenkins.sh b/admin/copy-release-from-jenkins.sh
new file mode 100755
index 0000000000..dd20ac2c17
--- /dev/null
+++ b/admin/copy-release-from-jenkins.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Requires s3cmd to be installed and an appropriate ~/.s3cfg.
+# Usage:
+#    admin/copy-release-from-jenkins.sh [--prod] BUILDNUMBER
+# where BUILDNUMBER is the small integer Jenkins build number.
+
+set -e
+set -u
+
+cd `dirname $0`
+
+TARGET="s3://com.meteor.static/test/"
+TEST=no
+if [ $# -ge 1 -a $1 = '--prod' ]; then
+    shift
+    TARGET="s3://com.meteor.static/"
+else
+    TEST=yes
+fi
+
+if [ $# -ne 1 ]; then
+    echo "usage: $0 [--prod] jenkins-build-number" 1>&2
+    exit 1
+fi
+
+DIRNAME=$(s3cmd ls s3://com.meteor.jenkins/ | perl -nle 'print $1 if m!/(release-.+--'$1'--.+)/!')
+
+if [ -z "$DIRNAME" ]; then
+    echo "build not found" 1>&2
+    exit 1
+fi
+
+echo Found build $DIRNAME
+
+# Check to make sure the proper number of each kind of file is there.
+s3cmd ls s3://com.meteor.jenkins/$DIRNAME/ | \
+  perl -nle '++$RPM if /\.rpm/; ++$DEB if /\.deb/; ++$TAR if /\.tar\.gz/; ++$DIR if /DIR/; END { exit !($RPM == 2 && $DEB == 2 && $TAR == 3 && $DIR == 1) }'
+
+echo Copying to $TARGET
+s3cmd -P cp -r s3://com.meteor.jenkins/$DIRNAME/ $TARGET
+
+if [ $TEST = 'yes' ]; then
+    echo Uploading modified install-s3.sh and manifest.json
+
+    OUTDIR=$(mktemp -dt meteor-crfj)
+    perl -pe 's!https://d3sqy0vbqsdhku.cloudfront.net!https://s3.amazonaws.com/com.meteor.static/test!g' install-s3.sh >$OUTDIR/install-s3.sh
+    perl -pe 's!https://d3sqy0vbqsdhku.cloudfront.net!https://s3.amazonaws.com/com.meteor.static/test!g' manifest.json >$OUTDIR/manifest.json
+
+    cd $OUTDIR
+    s3cmd -P put install-s3.sh s3://com.meteor.static/test/update/
+    s3cmd -P put manifest.json s3://com.meteor.static/test/update/
+fi
diff --git a/admin/debian/changelog b/admin/debian/changelog
index 6b85fb6ca3..b8b7317e6b 100644
--- a/admin/debian/changelog
+++ b/admin/debian/changelog
@@ -1,4 +1,4 @@
-meteor (0.5.2-1) unstable; urgency=low
+meteor (0.5.3-1) unstable; urgency=low
 
   * Automated debian build.
 
diff --git a/admin/find-new-npm-versions.sh b/admin/find-new-npm-versions.sh
new file mode 100755
index 0000000000..fd52630f85
--- /dev/null
+++ b/admin/find-new-npm-versions.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+BASEDIR=`dirname $0`
+cat $BASEDIR/generate-dev-bundle.sh | grep "npm install" | sed "s/npm install //" | sed "s/@.*//" | while read PACKAGE
+do
+  CURRENT_VERSION=`cat $BASEDIR/generate-dev-bundle.sh | grep "npm install $PACKAGE" | sed "s/npm install //" | sed "s/.*@//"`
+  LATEST_VERSION=`$BASEDIR/../dev_bundle/bin/npm info $PACKAGE version 2> /dev/null`
+  if [ "$CURRENT_VERSION" != "$LATEST_VERSION" ]
+  then
+    echo "$PACKAGE -- current version: $CURRENT_VERSION, latest version: $LATEST_VERSION"
+  fi
+done
diff --git a/admin/generate-dev-bundle.sh b/admin/generate-dev-bundle.sh
index c62cdda806..e3a1e2ad14 100755
--- a/admin/generate-dev-bundle.sh
+++ b/admin/generate-dev-bundle.sh
@@ -3,7 +3,7 @@
 set -e
 set -u
 
-BUNDLE_VERSION=0.2.8
+BUNDLE_VERSION=0.2.12
 UNAME=$(uname)
 ARCH=$(uname -m)
 
@@ -89,7 +89,7 @@ npm install semver@1.1.0
 npm install handlebars@1.0.7
 npm install mongodb@1.1.11
 npm install uglify-js@1.3.4
-npm install clean-css@0.8.2
+npm install clean-css@0.8.3
 npm install useragent@1.1.0
 npm install request@2.12.0
 npm install simplesmtp@0.1.25
@@ -97,6 +97,8 @@ npm install stream-buffers@0.2.3
 npm install keypress@0.1.0
 npm install sockjs@0.3.4
 npm install http-proxy@0.8.5
+npm install underscore@1.4.2
+npm install tar@0.1.14
 
 # progress 0.1.0 has a regression where it opens stdin and thus does not
 # allow the node process to exit cleanly. See
@@ -107,6 +109,13 @@ npm install progress@0.0.5
 # which make the dev bundle much bigger. We need a better solution.
 npm install mailcomposer@0.1.15
 
+# Use our version of fstream with a bug fixed.  Also have tar use it.
+# See https://github.com/isaacs/fstream/pull/11 .
+npm install https://github.com/meteor/fstream/tarball/91c56e7
+cd tar/node_modules
+npm install https://github.com/meteor/fstream/tarball/91c56e7
+cd ../..
+
 # If you update the version of fibers in the dev bundle, also update the "npm
 # install" command in docs/client/concepts.html.
 npm install fibers@0.6.9
diff --git a/admin/increment-version.js b/admin/increment-version.js
index 4c961b1039..13267dc61b 100644
--- a/admin/increment-version.js
+++ b/admin/increment-version.js
@@ -7,7 +7,7 @@ var semver = require('semver');
 var optimist = require('optimist');
 
 var updater = require(path.join(__dirname, '..', 'app', 'lib', 'updater.js'));
-var _ = require(path.join(__dirname, '..', 'app', 'lib', 'third', 'underscore.js'));
+var _ = require('underscore');
 
 // What files to update. Relative to project root.
 var UPDATE_FILES = [path.join('app', 'lib', 'updater.js'),
diff --git a/admin/install-s3.sh b/admin/install-s3.sh
index eb3ccc3ee8..91fbc35085 100755
--- a/admin/install-s3.sh
+++ b/admin/install-s3.sh
@@ -5,7 +5,7 @@
 ## example.
 
 URLBASE="https://d3sqy0vbqsdhku.cloudfront.net"
-VERSION="0.5.2"
+VERSION="0.5.3"
 PKGVERSION="${VERSION}-1"
 
 UNAME=`uname`
diff --git a/admin/manifest.json b/admin/manifest.json
index 79fb8a130c..d0f3e2f9fc 100644
--- a/admin/manifest.json
+++ b/admin/manifest.json
@@ -1,6 +1,6 @@
 {
-  "version": "0.5.2",
-  "deb_version": "0.5.2-1",
-  "rpm_version": "0.5.2-1",
+  "version": "0.5.3",
+  "deb_version": "0.5.3-1",
+  "rpm_version": "0.5.3-1",
   "urlbase": "https://d3sqy0vbqsdhku.cloudfront.net"
 }
diff --git a/admin/meteor.spec b/admin/meteor.spec
index 25fe47ef1e..9388c6198e 100644
--- a/admin/meteor.spec
+++ b/admin/meteor.spec
@@ -5,7 +5,7 @@
 Summary: Meteor platform and JavaScript application server
 Vendor: Meteor
 Name: meteor
-Version: 0.5.2
+Version: 0.5.3
 Release: 1
 License: MIT
 Group: Networking/WWW
diff --git a/admin/node.sh b/admin/node.sh
index 2afc873160..d22cd6bbd3 100755
--- a/admin/node.sh
+++ b/admin/node.sh
@@ -20,6 +20,7 @@ if [ "$EMACS" == t ]; then
 fi
 
 "$TOPDIR/dev_bundle/bin/node" "$@"
+EXITSTATUS=$?
 
 # Node sets stdin to non-blocking, which causes Emacs shell to die after it
 # exits. Work around this by setting stdin to blocking again.
@@ -27,3 +28,5 @@ if [ "$EMACS" == t ]; then
     perl -MFcntl=F_GETFL,F_SETFL,O_NONBLOCK -e \
         'fcntl(STDIN, F_SETFL, ~O_NONBLOCK & fcntl(STDIN, F_GETFL, 0))'
 fi
+
+exit $EXITSTATUS
diff --git a/app/lib/bundler.js b/app/lib/bundler.js
index 00b9c067f5..045077f004 100644
--- a/app/lib/bundler.js
+++ b/app/lib/bundler.js
@@ -31,7 +31,7 @@ var crypto = require('crypto');
 var fs = require('fs');
 var uglify = require('uglify-js');
 var cleanCSS = require('clean-css');
-var _ = require(path.join(__dirname, 'third', 'underscore.js'));
+var _ = require('underscore');
 
 // files to ignore when bundling. node has no globs, so use regexps
 var ignore_files = [
@@ -143,7 +143,7 @@ _.extend(PackageInstance.prototype, {
   // should be the extension of the file without a leading dot.)
   get_source_handler: function (extension) {
     var self = this;
-    var candidates = []
+    var candidates = [];
 
     if (extension in self.pkg.extensions)
       candidates.push(self.pkg.extensions[extension]);
@@ -277,7 +277,7 @@ var Bundle = function () {
       _.each(where, function (w) {
         if (options.type === "js") {
           if (!options.path)
-            throw new Error("Must specify path")
+            throw new Error("Must specify path");
 
           if (w === "client" || w === "server") {
             self.files[w][options.path] = data;
@@ -292,7 +292,7 @@ var Bundle = function () {
             // that appear in the server directories in an app tree
             return;
           if (!options.path)
-            throw new Error("Must specify path")
+            throw new Error("Must specify path");
           self.files.client[options.path] = data;
           self.css.push(options.path);
         } else if (options.type === "head" || options.type === "body") {
@@ -358,8 +358,8 @@ _.extend(Bundle.prototype, {
     // XXX detect circular dependencies and print an error. (not sure
     // what the current code will do)
 
-    if (pkg.on_use)
-      pkg.on_use(inst.api, where);
+    if (pkg.on_use_handler)
+      pkg.on_use_handler(inst.api, where);
   },
 
   include_tests: function (pkg) {
@@ -369,8 +369,8 @@ _.extend(Bundle.prototype, {
     self.tests_included[pkg.id] = true;
 
     var inst = self._get_instance(pkg);
-    if (inst.pkg.on_test)
-      inst.pkg.on_test(inst.api);
+    if (inst.pkg.on_test_handler)
+      inst.pkg.on_test_handler(inst.api);
   },
 
   // Minify the bundle
diff --git a/app/lib/files.js b/app/lib/files.js
index 902f6c078f..cfb555307e 100644
--- a/app/lib/files.js
+++ b/app/lib/files.js
@@ -1,6 +1,6 @@
 var fs = require("fs");
 var path = require('path');
-var _ = require(path.join(__dirname, 'third', 'underscore.js'));
+var _ = require('underscore');
 
 var files = module.exports = {
   // A sort comparator to order files into load order.
diff --git a/app/lib/mongo_exit_codes.js b/app/lib/mongo_exit_codes.js
new file mode 100644
index 0000000000..4e5dfe2e79
--- /dev/null
+++ b/app/lib/mongo_exit_codes.js
@@ -0,0 +1,67 @@
+// MongoDB exit codes.  This replicates information in
+// https://github.com/mongodb/docs/blob/master/source/reference/exit-codes.txt
+// but in a javascript dictionary instead of just a text file.
+
+// Explanations have been rewritten, not copied, for license reasons.
+
+
+var path = require("path");
+var _ = require('underscore');
+
+exports.Codes = {
+  0 : { code: 0,
+        symbol: "EXIT_CLEAN",
+        longText: "MongoDB exited cleanly"
+      },
+  2 : { code: 2,
+        symbol: "EXIT_BADOPTIONS",
+        longText: "MongoDB was started with erroneous or incompatible command line options"
+      },
+  3 : { code: 3,
+        symbol: "EXIT_REPLICATION_ERROR",
+        longText: "There was an inconsistency between hostnames specified\n" +
+        "on the command line compared with hostnames stored in local.sources"
+      },
+  4 : { code: 4,
+        symbol: "EXIT_NEED_UPGRADE",
+        longText: "MongoDB needs to upgrade to use this database"
+      },
+  5 : { code: 5,
+        symbol: "EXIT_SHARDING_ERROR",
+        longText: "A moveChunk operation failed"
+      },
+  12 : { code: 12,
+         symbol: "EXIT_KILL",
+         longText: "The MongoDB process was killed, on Windows"
+       },
+  14 : { code: 14,
+         symbol: "EXIT_ABRUPT",
+         longText: "Unspecified unrecoverable error. Exit was not clean"
+       },
+  20 : { code: 20,
+         symbol: "EXIT_NTSERVICE_ERROR",
+         longText: "Error managing NT Service on Windows"
+       },
+  45 : { code: 45,
+         symbol: "EXIT_FS",
+         longText: "MongoDB cannot open or obtain a lock on a file"
+       },
+  47 : { code: 47,
+         symbol: "EXIT_CLOCK_SKEW",
+         longText: "MongoDB exited due to excess clock skew"
+       },
+  48 : { code: 48,
+         symbol: "EXIT_NET_ERROR",
+         longText: "MongoDB exited because its port was closed, or was already\n" +
+         "taken by a previous instance of MongoDB"
+       },
+  100 : { code: 100,
+          symbol: "EXIT_UNCAUGHT",
+          longText: "MongoDB had an unspecified uncaught exception.\n" +
+          "Check to make sure that MongoDB is able to write to its database directory."
+        }
+};
+
+_.each(exports.Codes, function (value) {
+  exports[value.symbol] = value;
+});
diff --git a/app/lib/mongo_runner.js b/app/lib/mongo_runner.js
index df3f8f14ce..6599d3606e 100644
--- a/app/lib/mongo_runner.js
+++ b/app/lib/mongo_runner.js
@@ -1,10 +1,10 @@
 var fs = require("fs");
 var path = require("path");
-var spawn = require('child_process').spawn;
+var child_process = require('child_process');
 
 var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
 
-var _ = require(path.join('..', 'lib', 'third', 'underscore.js'));
+var _ = require('underscore');
 
 
 /** Internal.
@@ -15,37 +15,34 @@ var _ = require(path.join('..', 'lib', 'third', 'underscore.js'));
  */
 var find_mongo_pids = function (app_dir, port, callback) {
   // 'ps ax' should be standard across all MacOS and Linux.
-  var proc = spawn('ps', ['ax']);
-  var data = '';
-  proc.stdout.on('data', function (d) {
-    data += d;
-  });
+  child_process.exec('ps ax',
+    function (error, stdout, stderr) {
+      if (error) {
+        callback({reason: error});
+      } else if (stderr) {
+        callback({reason: 'ps produced stderr ' + stderr});
+      } else {
+        var pids = [];
 
-  proc.on('exit', function (code, signal) {
-    if (code === 0) {
-      var pids = [];
+        _.each(stdout.split('\n'), function (ps_line) {
+          // matches mongos we start.
+          var m = ps_line.match(/^\s*(\d+).+mongod .+--port (\d+) --dbpath (.+)(?:\/|\\)\.meteor(?:\/|\\)local(?:\/|\\)db\s*$/);
+          if (m && m.length === 4) {
+            var found_pid =  parseInt(m[1]);
+            var found_port = parseInt(m[2]);
+            var found_path = m[3];
 
-      _.each(data.split('\n'), function (ps_line) {
-        // matches mongos we start.
-        var m = ps_line.match(/^\s*(\d+).+mongod .+--port (\d+) --dbpath (.+)(?:\/|\\)\.meteor(?:\/|\\)local(?:\/|\\)db\s*$/);
-        if (m && m.length === 4) {
-          var found_pid =  parseInt(m[1]);
-          var found_port = parseInt(m[2]);
-          var found_path = m[3];
-
-          if ( (!port || port === found_port) &&
-               (!app_dir || app_dir === found_path)) {
-            pids.push({
-              pid: found_pid, port: found_port, app_dir: found_path});
+            if ( (!port || port === found_port) &&
+                 (!app_dir || app_dir === found_path)) {
+              pids.push({
+                pid: found_pid, port: found_port, app_dir: found_path});
+            }
           }
-        }
-      });
+        });
 
-      callback(null, pids);
-    } else {
-      callback({reason: 'ps exit code ' + code});
-    }
-  });
+        callback(null, pids);
+      }
+    });
 };
 
 
@@ -131,17 +128,24 @@ var find_mongo_and_kill_it_dead = function (port, callback) {
 };
 
 exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callback) {
+  var handle = {stop: function (callback) { callback(); } };
   launch_callback = launch_callback || function () {};
   on_exit_callback = on_exit_callback || function () {};
 
   // If we are passed an external mongo, assume it is launched and never
   // exits. Matches code in run.js:exports.run.
+
+  // Since it is externally managed, asking it to actually stop would be
+  // impolite, so our stoppable handle is a noop
   if (process.env.MONGO_URL) {
     launch_callback();
-    return;
+    return handle;
   }
 
-  var mongod_path = path.join(files.get_dev_bundle(), 'mongodb', 'bin', 'mongod');
+  var mongod_path = path.join(files.get_dev_bundle(),
+                              'mongodb',
+                              'bin',
+                              'mongod');
 
   // store data in app_dir
   var data_path = path.join(app_dir, '.meteor', 'local', 'db');
@@ -155,21 +159,21 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
       return;
     }
 
-    var proc = spawn(mongod_path, [
+    var proc = child_process.spawn(mongod_path, [
       '--bind_ip', '127.0.0.1',
       '--smallfiles',
       '--port', port,
       '--dbpath', data_path
     ]);
+    handle.stop = function (callback) {
+      var tries = 0;
+      var exited = false;
+      proc.removeListener('exit', on_exit_callback);
+      proc.kill('SIGINT');
+      callback && callback(err);
+    };
 
-    proc.on('exit', function (code, signal) {
-      on_exit_callback(code, signal);
-    });
-
-    // proc.stderr.setEncoding('utf8');
-    // proc.stderr.on('data', function (data) {
-    //   process.stdout.write(data);
-    // });
+    proc.on('exit', on_exit_callback);
 
     proc.stdout.setEncoding('utf8');
     proc.stdout.on('data', function (data) {
@@ -178,6 +182,5 @@ exports.launch_mongo = function (app_dir, port, launch_callback, on_exit_callbac
         launch_callback();
     });
   });
-
+  return handle;
 };
-
diff --git a/app/lib/packages.js b/app/lib/packages.js
index 61ab330172..3a0c3a6a62 100644
--- a/app/lib/packages.js
+++ b/app/lib/packages.js
@@ -1,5 +1,5 @@
 var path = require('path');
-var _ = require(path.join(__dirname, 'third', 'underscore.js'));
+var _ = require('underscore');
 var files = require(path.join(__dirname, 'files.js'));
 var fs = require('fs');
 
@@ -36,14 +36,14 @@ var Package = function () {
   // package metadata, from describe()
   self.metadata = {};
 
-  self.on_use = null;
-  self.on_test = null;
+  self.on_use_handler = null;
+  self.on_test_handler = null;
 
   // registered source file handlers
   self.extensions = {};
 
   // functions that can be called when the package is scanned
-  self.api = {
+  self.declarationFuncs = {
     // keys
     // - summary: for 'meteor list'
     // - internal: if true, hide in list
@@ -60,15 +60,15 @@ var Package = function () {
     },
 
     on_use: function (f) {
-      if (self.on_use)
+      if (self.on_use_handler)
         throw new Error("A package may have only one on_use handler");
-      self.on_use = f;
+      self.on_use_handler = f;
     },
 
     on_test: function (f) {
-      if (self.on_test)
+      if (self.on_test_handler)
         throw new Error("A package may have only one on_test handler");
-      self.on_test = f;
+      self.on_test_handler = f;
     },
 
     register_extension: function (extension, callback) {
@@ -86,10 +86,10 @@ _.extend(Package.prototype, {
     self.name = name;
     self.source_root = files.get_package_dir(name);
     self.serve_root = path.join(path.sep, 'packages', name);
-    
+
     if (!self.source_root)
       throw new Error("The package named " + self.name + " does not exist.");
-    
+
     var fullpath = path.join(self.source_root, 'package.js');
     var code = fs.readFileSync(fullpath).toString();
     // \n is necessary in case final line is a //-comment
@@ -104,7 +104,7 @@ _.extend(Package.prototype, {
     // 'templating' use this to load other code to run at
     // bundle-time. and to pull in, eg, 'fs' and 'path' to access
     // the file system
-    func(self.api, require);
+    func(self.declarationFuncs, require);
   },
 
   init_from_app_dir: function (app_dir, ignore_files) {
@@ -124,7 +124,7 @@ _.extend(Package.prototype, {
         });
     };
 
-    self.api.on_use(function (api) {
+    self.declarationFuncs.on_use(function (api) {
       // -- Packages --
 
       // standard client packages (for now), for the classic meteor
@@ -140,7 +140,7 @@ _.extend(Package.prototype, {
       api.add_files(sources_except(api, "client"), "server");
     });
 
-    self.api.on_test(function (api) {
+    self.declarationFuncs.on_test(function (api) {
       api.use(self);
       api.add_files(sources_except(api, "server", true), "client");
       api.add_files(sources_except(api, "client", true), "server");
@@ -202,7 +202,7 @@ _.extend(Package.prototype, {
     self.source_root = null;
     self.serve_root = null;
 
-    self.api.on_test(function (api) {
+    self.declarationFuncs.on_test(function (api) {
       _.each(fs.readdirSync(collection_dir), function (name) {
         // only take things that are actually packages
         if (files.is_package_dir(path.join(collection_dir, name)))
@@ -269,13 +269,13 @@ var packages = module.exports = {
   // a package object.
   list: function () {
     var ret = {};
-    
+
     _.each(files.get_package_dirs(), function(dir) {
       _.each(fs.readdirSync(dir), function (name) {
         // skip .meteor directory
         if (fs.existsSync(path.join(dir, name, 'package.js')))
           ret[name] = packages.get(name);
-      });      
+      });
     })
 
     return ret;
diff --git a/app/lib/project.js b/app/lib/project.js
index a8905c86e6..fdf7353b8b 100644
--- a/app/lib/project.js
+++ b/app/lib/project.js
@@ -1,6 +1,6 @@
 var fs = require('fs');
 var path = require('path');
-var _ = require(path.join(__dirname, 'third', 'underscore.js'));
+var _ = require('underscore');
 
 var project = module.exports = {
 
diff --git a/app/lib/third/underscore.js b/app/lib/third/underscore.js
deleted file mode 100644
index 1ebe2671b9..0000000000
--- a/app/lib/third/underscore.js
+++ /dev/null
@@ -1,1200 +0,0 @@
-//     Underscore.js 1.4.2
-//     http://underscorejs.org
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var push             = ArrayProto.push,
-      slice            = ArrayProto.slice,
-      concat           = ArrayProto.concat,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) {
-    if (obj instanceof _) return obj;
-    if (!(this instanceof _)) return new _(obj);
-    this._wrapped = obj;
-  };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.4.2';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return arguments.length > 2 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var length = obj.length;
-    if (length !== +length) {
-      var keys = _.keys(obj);
-      length = keys.length;
-    }
-    each(obj, function(value, index, list) {
-      index = keys ? keys[--length] : --length;
-      if (!initial) {
-        memo = obj[index];
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, obj[index], index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if the array or object contains a given value (using `===`).
-  // Aliased as `include`.
-  _.contains = _.include = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
-      return value === target;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Convenience version of a common use case of `filter`: selecting only objects
-  // with specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    if (_.isEmpty(attrs)) return [];
-    return _.filter(obj, function(value) {
-      for (var key in attrs) {
-        if (attrs[key] !== value[key]) return false;
-      }
-      return true;
-    });
-  };
-
-  // Return the maximum element or (element-based computation).
-  // Can't optimize arrays of integers longer than 65,535 elements.
-  // See: https://bugs.webkit.org/show_bug.cgi?id=80797
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.max.apply(Math, obj);
-    }
-    if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.min.apply(Math, obj);
-    }
-    if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Shuffle an array.
-  _.shuffle = function(obj) {
-    var rand;
-    var index = 0;
-    var shuffled = [];
-    each(obj, function(value) {
-      rand = _.random(index++);
-      shuffled[index - 1] = shuffled[rand];
-      shuffled[rand] = value;
-    });
-    return shuffled;
-  };
-
-  // An internal function to generate lookup iterators.
-  var lookupIterator = function(value) {
-    return _.isFunction(value) ? value : function(obj){ return obj[value]; };
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, value, context) {
-    var iterator = lookupIterator(value);
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        index : index,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria;
-      var b = right.criteria;
-      if (a !== b) {
-        if (a > b || a === void 0) return 1;
-        if (a < b || b === void 0) return -1;
-      }
-      return left.index < right.index ? -1 : 1;
-    }), 'value');
-  };
-
-  // An internal function used for aggregate "group by" operations.
-  var group = function(obj, value, context, behavior) {
-    var result = {};
-    var iterator = lookupIterator(value);
-    each(obj, function(value, index) {
-      var key = iterator.call(context, value, index, obj);
-      behavior(result, key, value);
-    });
-    return result;
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
-    });
-  };
-
-  // Counts instances of an object that group by a certain criterion. Pass
-  // either a string attribute to count by, or a function that returns the
-  // criterion.
-  _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      if (!_.has(result, key)) result[key] = 0;
-      result[key]++;
-    });
-  };
-
-  // Use a comparator function to figure out the smallest index at which
-  // an object should be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator, context) {
-    iterator = iterator == null ? _.identity : lookupIterator(iterator);
-    var value = iterator.call(context, obj);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >>> 1;
-      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(obj) {
-    if (!obj) return [];
-    if (obj.length === +obj.length) return slice.call(obj);
-    return _.values(obj);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head` and `take`. The **guard** check
-  // allows it to work with `_.map`.
-  _.first = _.head = _.take = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the last entry of the array. Especially useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
-      return array[array.length - 1];
-    }
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
-  // Especially useful on the arguments object. Passing an **n** will return
-  // the rest N values in the array. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = _.drop = function(array, n, guard) {
-    return slice.call(array, (n == null) || guard ? 1 : n);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Internal implementation of a recursive `flatten` function.
-  var flatten = function(input, shallow, output) {
-    each(input, function(value) {
-      if (_.isArray(value)) {
-        shallow ? push.apply(output, value) : flatten(value, shallow, output);
-      } else {
-        output.push(value);
-      }
-    });
-    return output;
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array, shallow) {
-    return flatten(array, shallow, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator, context) {
-    var initial = iterator ? _.map(array, iterator, context) : array;
-    var results = [];
-    var seen = [];
-    each(initial, function(value, index) {
-      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
-        seen.push(value);
-        results.push(array[index]);
-      }
-    });
-    return results;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(concat.apply(ArrayProto, arguments));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays.
-  _.intersection = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.contains(rest, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) {
-      results[i] = _.pluck(args, "" + i);
-    }
-    return results;
-  };
-
-  // Converts lists into objects. Pass either a single array of `[key, value]`
-  // pairs, or two parallel arrays of the same length -- one of keys, and one of
-  // the corresponding values.
-  _.object = function(list, values) {
-    var result = {};
-    for (var i = 0, l = list.length; i < l; i++) {
-      if (values) {
-        result[list[i]] = values[i];
-      } else {
-        result[list[i][0]] = list[i][1];
-      }
-    }
-    return result;
-  };
-
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i = 0, l = array.length;
-    if (isSorted) {
-      if (typeof isSorted == 'number') {
-        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
-      } else {
-        i = _.sortedIndex(array, item);
-        return array[i] === item ? i : -1;
-      }
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
-    for (; i < l; i++) if (array[i] === item) return i;
-    return -1;
-  };
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item, from) {
-    if (array == null) return -1;
-    var hasIndex = from != null;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
-      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
-    }
-    var i = (hasIndex ? from : array.length);
-    while (i--) if (array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(null, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more, result;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
-    return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) {
-          result = func.apply(context, args);
-        }
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        throttling = true;
-        result = func.apply(context, args);
-      }
-      whenDone();
-      return result;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds. If `immediate` is passed, trigger the function on the
-  // leading edge, instead of the trailing.
-  _.debounce = function(func, wait, immediate) {
-    var timeout, result;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        if (!immediate) result = func.apply(context, args);
-      };
-      var callNow = immediate && !timeout;
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-      if (callNow) result = func.apply(context, args);
-      return result;
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      memo = func.apply(this, arguments);
-      func = null;
-      return memo;
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return function() {
-      var args = [func];
-      push.apply(args, arguments);
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = arguments;
-    return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    if (times <= 0) return func();
-    return function() {
-      if (--times < 1) {
-        return func.apply(this, arguments);
-      }
-    };
-  };
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    var values = [];
-    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
-    return values;
-  };
-
-  // Convert an object into a list of `[key, value]` pairs.
-  _.pairs = function(obj) {
-    var pairs = [];
-    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
-    return pairs;
-  };
-
-  // Invert the keys and values of an object. The values must be serializable.
-  _.invert = function(obj) {
-    var result = {};
-    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
-    return result;
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Return a copy of the object only containing the whitelisted properties.
-  _.pick = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    each(keys, function(key) {
-      if (key in obj) copy[key] = obj[key];
-    });
-    return copy;
-  };
-
-   // Return a copy of the object without the blacklisted properties.
-  _.omit = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    for (var key in obj) {
-      if (!_.contains(keys, key)) copy[key] = obj[key];
-    }
-    return copy;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function for `isEqual`.
-  var eq = function(a, b, aStack, bStack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a instanceof _) a = a._wrapped;
-    if (b instanceof _) b = b._wrapped;
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className != toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return a == String(b);
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = aStack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (aStack[length] == a) return bStack[length] == b;
-    }
-    // Add the first object to the stack of traversed objects.
-    aStack.push(a);
-    bStack.push(b);
-    var size = 0, result = true;
-    // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
-        }
-      }
-    } else {
-      // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
-                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
-      }
-      // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
-      if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
-        }
-        result = !size;
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    aStack.pop();
-    bStack.pop();
-    return result;
-  };
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, [], []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (obj == null) return true;
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType === 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
-  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
-    _['is' + name] = function(obj) {
-      return toString.call(obj) == '[object ' + name + ']';
-    };
-  });
-
-  // Define a fallback version of the method in browsers (ahem, IE), where
-  // there isn't any inspectable "Arguments" type.
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
-    };
-  }
-
-  // Optimize `isFunction` if appropriate.
-  if (typeof (/./) !== 'function') {
-    _.isFunction = function(obj) {
-      return typeof obj === 'function';
-    };
-  }
-
-  // Is a given object a finite number?
-  _.isFinite = function(obj) {
-    return _.isNumber(obj) && isFinite(obj);
-  };
-
-  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
-  _.isNaN = function(obj) {
-    return _.isNumber(obj) && obj != +obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Shortcut function for checking if an object has a given property directly
-  // on itself (in other words, not on a prototype).
-  _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function(n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Return a random integer between min and max (inclusive).
-  _.random = function(min, max) {
-    if (max == null) {
-      max = min;
-      min = 0;
-    }
-    return min + (0 | Math.random() * (max - min + 1));
-  };
-
-  // List of HTML entities for escaping.
-  var entityMap = {
-    escape: {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      "'": '&#x27;',
-      '/': '&#x2F;'
-    }
-  };
-  entityMap.unescape = _.invert(entityMap.escape);
-
-  // Regexes containing the keys and values listed immediately above.
-  var entityRegexes = {
-    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
-    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
-  };
-
-  // Functions for escaping and unescaping strings to/from HTML interpolation.
-  _.each(['escape', 'unescape'], function(method) {
-    _[method] = function(string) {
-      if (string == null) return '';
-      return ('' + string).replace(entityRegexes[method], function(match) {
-        return entityMap[method][match];
-      });
-    };
-  });
-
-  // If the value of the named property is a function then invoke it;
-  // otherwise, return it.
-  _.result = function(object, property) {
-    if (object == null) return null;
-    var value = object[property];
-    return _.isFunction(value) ? value.call(object) : value;
-  };
-
-  // Add your own custom functions to the Underscore object.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      var func = _[name] = obj[name];
-      _.prototype[name] = function() {
-        var args = [this._wrapped];
-        push.apply(args, arguments);
-        return result.call(this, func.apply(_, args));
-      };
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /(.)^/;
-
-  // Certain characters need to be escaped so that they can be put into a
-  // string literal.
-  var escapes = {
-    "'":      "'",
-    '\\':     '\\',
-    '\r':     'r',
-    '\n':     'n',
-    '\t':     't',
-    '\u2028': 'u2028',
-    '\u2029': 'u2029'
-  };
-
-  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(text, data, settings) {
-    settings = _.defaults({}, settings, _.templateSettings);
-
-    // Combine delimiters into one regular expression via alternation.
-    var matcher = new RegExp([
-      (settings.escape || noMatch).source,
-      (settings.interpolate || noMatch).source,
-      (settings.evaluate || noMatch).source
-    ].join('|') + '|$', 'g');
-
-    // Compile the template source, escaping string literals appropriately.
-    var index = 0;
-    var source = "__p+='";
-    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
-      source += text.slice(index, offset)
-        .replace(escaper, function(match) { return '\\' + escapes[match]; });
-      source +=
-        escape ? "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'" :
-        interpolate ? "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'" :
-        evaluate ? "';\n" + evaluate + "\n__p+='" : '';
-      index = offset + match.length;
-    });
-    source += "';\n";
-
-    // If a variable is not specified, place data values in local scope.
-    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
-
-    source = "var __t,__p='',__j=Array.prototype.join," +
-      "print=function(){__p+=__j.call(arguments,'');};\n" +
-      source + "return __p;\n";
-
-    try {
-      var render = new Function(settings.variable || 'obj', '_', source);
-    } catch (e) {
-      e.source = source;
-      throw e;
-    }
-
-    if (data) return render(data, _);
-    var template = function(data) {
-      return render.call(this, data, _);
-    };
-
-    // Provide the compiled function source as a convenience for precompilation.
-    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
-
-    return template;
-  };
-
-  // Add a "chain" function, which will delegate to the wrapper.
-  _.chain = function(obj) {
-    return _(obj).chain();
-  };
-
-  // OOP
-  // ---------------
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj) {
-    return this._chain ? _(obj).chain() : obj;
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      var obj = this._wrapped;
-      method.apply(obj, arguments);
-      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
-      return result.call(this, obj);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      return result.call(this, method.apply(this._wrapped, arguments));
-    };
-  });
-
-  _.extend(_.prototype, {
-
-    // Start chaining a wrapped Underscore object.
-    chain: function() {
-      this._chain = true;
-      return this;
-    },
-
-    // Extracts the result from a wrapped and chained object.
-    value: function() {
-      return this._wrapped;
-    }
-
-  });
-
-}).call(this);
diff --git a/app/lib/updater.js b/app/lib/updater.js
index 43589b7c66..54d3a62526 100644
--- a/app/lib/updater.js
+++ b/app/lib/updater.js
@@ -1,4 +1,8 @@
-exports.CURRENT_VERSION = "0.5.2";
+// During automated QA of the updater, modify this file to set testingUpdater to
+// true. This will make it act as if it is at version 0.1.0 and use test URLs
+// for update checks.
+var testingUpdater = false;
+exports.CURRENT_VERSION = testingUpdater ? "0.1.0" : "0.5.3";
 
 var fs = require("fs");
 var http = require("http");
@@ -8,11 +12,10 @@ var semver = require("semver");
 
 var files = require(path.join(__dirname, 'files.js'));
 
-var manifest_options = {
-/* uncomment for testing
+var manifest_options = testingUpdater ? {
   host: 's3.amazonaws.com',
   path: '/com.meteor.static/test/update/manifest.json'
-*/
+} : {
   host: 'update.meteor.com',
   path: '/manifest.json'
 };
diff --git a/app/meteor/deploy.js b/app/meteor/deploy.js
index 4110db4afd..5a9166b7b3 100644
--- a/app/meteor/deploy.js
+++ b/app/meteor/deploy.js
@@ -10,7 +10,7 @@ var request = require('request');
 var qs = require('querystring');
 var path = require('path');
 var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
-var _ = require(path.join(__dirname, '..', 'lib', 'third', 'underscore.js'));
+var _ = require('underscore');
 var keypress = require('keypress');
 var child_process = require('child_process');
 
@@ -33,10 +33,15 @@ if (process.env.EMACS == "t") {
 // interactively prompt for here.
 
 var meteor_rpc = function (rpc_name, method, site, query_params, callback) {
-  var url = "https://" + DEPLOY_HOSTNAME + '/' + rpc_name + '/' + site;
+  var url;
+  if (DEPLOY_HOSTNAME.indexOf("http://") === 0)
+    url = DEPLOY_HOSTNAME + '/' + rpc_name + '/' + site;
+  else
+    url = "https://" + DEPLOY_HOSTNAME + '/' + rpc_name + '/' + site;
 
-  if (!_.isEmpty(query_params))
+  if (!_.isEmpty(query_params)) {
     url += '?' + qs.stringify(query_params);
+  }
 
   var r = request({method: method, url: url}, function (error, response, body) {
     if (error || ((response.statusCode !== 200)
@@ -51,26 +56,39 @@ var meteor_rpc = function (rpc_name, method, site, query_params, callback) {
 };
 
 var deploy_app = function (url, app_dir, opt_debug, opt_tests,
-                           opt_set_password) {
+                           opt_set_password, settings) {
   var parsed_url = parse_url(url);
 
   // a bit contorted here to make sure we ask for the password before
   // launching the slow bundle process.
 
   with_password(parsed_url.hostname, function (password) {
+    var deployOptions = {
+      site: parsed_url.hostname,
+      appDir: app_dir,
+      debug: opt_debug,
+      tests: opt_tests,
+      password: password,
+      settings: settings
+    };
     if (opt_set_password)
       get_new_password(function (set_password) {
-        bundle_and_deploy(parsed_url.hostname, app_dir, opt_debug, opt_tests,
-                          password, set_password);
+        deployOptions.setPassword = set_password;
+        bundle_and_deploy(deployOptions);
       });
     else
-      bundle_and_deploy(parsed_url.hostname, app_dir, opt_debug, opt_tests,
-                        password);
+      bundle_and_deploy(deployOptions);
   });
 };
 
-var bundle_and_deploy = function (site, app_dir, opt_debug, opt_tests,
-                                  password, set_password) {
+var bundle_and_deploy = function (options) {
+  var site = options.site;
+  var app_dir = options.appDir;
+  var opt_debug = options.debug;
+  var opt_tests = options.tests;
+  var password = options.password;
+  var set_password = options.setPassword;
+  var settings = options.settings;
   var build_dir = path.join(app_dir, '.meteor', 'local', 'build_tar');
   var bundle_path = path.join(build_dir, 'bundle');
   var bundle_opts = { skip_dev_bundle: true, no_minify: !!opt_debug,
@@ -90,14 +108,17 @@ var bundle_and_deploy = function (site, app_dir, opt_debug, opt_tests,
 
   process.stdout.write('uploading ... ');
 
-  var opts = {};
-  if (password) opts.password = password;
-  if (set_password) opts.set_password = set_password;
+  var rpcOptions = {};
+  if (password) rpcOptions.password = password;
+  if (set_password) rpcOptions.set_password = set_password;
+
+  // When it hits the wire, all these opts will be URL-encoded.
+  if (settings !== undefined) rpcOptions.settings = settings;
 
   var tar = child_process.spawn(
     'tar', ['czf', '-', 'bundle'], {cwd: build_dir});
 
-  var rpc = meteor_rpc('deploy', 'POST', site, opts, function (err, body) {
+  var rpc = meteor_rpc('deploy', 'POST', site, rpcOptions, function (err, body) {
     if (err) {
       var errorMessage = (body || ("Connection error (" + err.message + ")"));
       process.stderr.write("\nError deploying application: " + errorMessage + "\n");
@@ -105,15 +126,34 @@ var bundle_and_deploy = function (site, app_dir, opt_debug, opt_tests,
     }
 
     process.stdout.write('done.\n');
-    process.stdout.write('Now serving at ' + site + '\n');
 
+    var hostname = null;
+    var response = null;
+    try {
+      response = JSON.parse(body);
+    } catch (e) {
+      // ... leave null
+    }
+    if (response && response.url) {
+      var url = require('url').parse(response.url);
+      if (url && url.hostname)
+        hostname = url.hostname;
+    }
+
+    if (!hostname) {
+      process.stdout.write('Error receiving hostname from deploy server.\n');
+      process.exit(1);
+    }
+
+    process.stdout.write('Now serving at ' + hostname + '\n');
     files.rm_recursive(build_dir);
 
-    if (!site.match('meteor.com')) {
+
+    if (hostname && !hostname.match(/meteor\.com$/)) {
       var dns = require('dns');
-      dns.resolve(site, 'CNAME', function (err, cnames) {
+      dns.resolve(hostname, 'CNAME', function (err, cnames) {
         if (err || cnames[0] !== 'origin.meteor.com') {
-          dns.resolve(site, 'A', function (err, addresses) {
+          dns.resolve(hostname, 'A', function (err, addresses) {
             if (err || addresses[0] !== '107.22.210.133') {
               process.stdout.write('-------------\n');
               process.stdout.write("You've deployed to a custom domain.\n");
@@ -207,9 +247,6 @@ var parse_url = function (url) {
 
   delete parsed.host; // we use hostname
 
-  if (parsed.hostname && !parsed.hostname.match(/\./))
-    parsed.hostname += '.meteor.com';
-
   if (!parsed.hostname) {
     process.stdout.write(
 "Please specify a domain to connect to, such as www.example.com or\n" +
diff --git a/app/meteor/meteor.js b/app/meteor/meteor.js
index db5df1c718..32ed04ed30 100644
--- a/app/meteor/meteor.js
+++ b/app/meteor/meteor.js
@@ -1,641 +1,667 @@
-var path = require('path');
-var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
-var _ = require(path.join(__dirname, '..', 'lib', 'third', 'underscore.js'));
-var deploy = require(path.join(__dirname, 'deploy'));
-var fs = require("fs");
+var Fiber = require('fibers');
+Fiber(function () {
 
-// This code is duplicated in app/server/server.js.
-var MIN_NODE_VERSION = 'v0.8.11';
-if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
-  process.stderr.write(
-    'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
-  process.exit(1);
-}
+  var path = require('path');
+  var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
+  var _ = require('underscore');
+  var deploy = require(path.join(__dirname, 'deploy'));
+  var fs = require("fs");
+  var runner = require(path.join(__dirname, 'run.js'));
 
-var usage = function() {
-  process.stdout.write(
-"Usage: meteor [--version] [--help] <command> [<args>]\n" +
-"\n" +
-"With no arguments, 'meteor' runs the project in the current\n" +
-"directory in local development mode. You can run it from the root\n" +
-"directory of the project or from any subdirectory.\n" +
-"\n" +
-"Use 'meteor create <name>' to create a new Meteor project.\n" +
-"\n" +
-"Commands:\n");
-  _.each(Commands, function (cmd) {
-    if (cmd.help) {
-      var name = cmd.name + "           ".substr(cmd.name.length);
-      process.stdout.write("   " + name + cmd.help + "\n");
-    }
-  });
-  process.stdout.write("\n");
-process.stdout.write(
-"See 'meteor help <command>' for details on a command.\n");
-  process.exit(1);
-};
-
-var require_project = function (cmd, accept_package) {
-  var app_dir = files.find_upwards(files.is_app_dir);
-  if (app_dir)
-    return app_dir;
-
-  var package_dir = files.find_upwards(function (p) {
-    return files.is_package_dir(p) || files.is_package_collection_dir(p);
-  });
-  if (package_dir) {
-    if (accept_package)
-      return package_dir;
-
-    process.stdout.write(cmd + ": Only works on applications, not packages\n");
+  // This code is duplicated in app/server/server.js.
+  var MIN_NODE_VERSION = 'v0.8.11';
+  if (require('semver').lt(process.version, MIN_NODE_VERSION)) {
+    process.stderr.write(
+      'Meteor requires Node ' + MIN_NODE_VERSION + ' or later.\n');
     process.exit(1);
   }
 
-  // This is where you end up if you type 'meteor' with no
-  // args. Be gentle to the noobs..
-  process.stdout.write(
-cmd + ": You're not in a Meteor project directory.\n" +
-"\n" +
-"To create a new Meteor project:\n" +
-"   meteor create <project name>\n" +
-"For example:\n" +
-"   meteor create myapp\n" +
-"\n" +
-"For more help, see 'meteor --help'.\n");
-  process.exit(1);
-};
-
-var find_mongo_port = function (cmd, callback) {
-  var app_dir = require_project(cmd);
-  var mongo_runner = require(path.join(__dirname, '..', 'lib', 'mongo_runner.js'));
-  mongo_runner.find_mongo_port(app_dir, callback);
-};
-
-Commands = [];
-
-var findCommand = function (name) {
-  for (var i = 0; i < Commands.length; i++)
-    if (Commands[i].name === name)
-      return Commands[i];
-  process.stdout.write("'" + name + "' is not a Meteor command. See " +
-                       "'meteor --help'.\n");
-  process.exit(1);
-};
-
-// XXX when the pass unexpected argument or unrecognized flags, print
-// an error and fail out
-
-Commands.push({
-  name: "run",
-  help: "[default] Run this project in local development mode",
-  func: function (argv) {
-    // reparse args
-    // This help logic should probably move to run.js eventually
-    var opt = require('optimist')
-      .alias('port', 'p').default('port', 3000)
-      .describe('port', 'Port to listen on. NOTE: Also uses port N+1 and N+2.')
-      .boolean('production')
-      .describe('production', 'Run in production mode. Minify and bundle CSS and JS files.')
-      .usage(
-"Usage: meteor run [options]\n" +
-"\n" +
-"Searches upward from the current directory for the root directory of a\n" +
-"Meteor project, then runs that project in local development\n" +
-"mode. You can use the application by pointing your web browser at\n" +
-"localhost:3000. No internet connection is required.\n" +
-"\n" +
-"Whenever you change any of the application's source files, the changes\n" +
-"are automatically detected and applied to the running application.\n" +
-"\n" +
-"The application's database persists between runs. It's stored under\n" +
-"the .meteor directory in the root of the project.\n"
-);
-
-    var new_argv = opt.argv;
-
-    if (argv.help) {
-      process.stdout.write(opt.help());
-      process.exit(1);
-    }
-
-    var app_dir = path.resolve(require_project("run", true)); // app or package
-    var bundle_opts = { no_minify: !new_argv.production, symlink_dev_bundle: true };
-    require(path.join(__dirname, 'run.js')).run(app_dir, bundle_opts, new_argv.port);
-  }
-});
-
-Commands.push({
-  name: "help",
-  func: function (argv) {
-    if (!argv._.length || argv.help)
-      usage();
-    var cmd = argv._.splice(0,1)[0];
-    argv.help = true;
-    findCommand(cmd).func(argv);
-  }
-});
-
-Commands.push({
-  name: "create",
-  help: "Create a new project",
-  func: function (argv) {
-    // reparse args
-    var opt = require('optimist')
-          .describe('example', 'Example template to use.')
-          .boolean('list')
-          .describe('list', 'Show list of available examples.')
-          .usage(
-"Usage: meteor create <name>\n" +
-"       meteor create --example <example_name> [<name>]\n" +
-"       meteor create --list\n" +
-"\n" +
-"Make a subdirectory named <name> and create a new Meteor project\n" +
-"there. You can also pass an absolute or relative path.\n" +
-"\n" +
-"You can pass --example to start off with a copy of one of the Meteor\n" +
-"sample applications. Use --list to see the available examples.");
-
-    var new_argv = opt.argv;
-    var appname;
-
-    var example_dir = path.join(__dirname, '..', '..', 'examples');
-    var examples = _.reject(fs.readdirSync(example_dir), function (e) {
-      return (e === 'unfinished' || e === 'other');
+  var usage = function() {
+    process.stdout.write(
+      "Usage: meteor [--version] [--help] <command> [<args>]\n" +
+        "\n" +
+        "With no arguments, 'meteor' runs the project in the current\n" +
+        "directory in local development mode. You can run it from the root\n" +
+        "directory of the project or from any subdirectory.\n" +
+        "\n" +
+        "Use 'meteor create <name>' to create a new Meteor project.\n" +
+        "\n" +
+        "Commands:\n");
+    _.each(Commands, function (cmd) {
+      if (cmd.help) {
+        var name = cmd.name + "           ".substr(cmd.name.length);
+        process.stdout.write("   " + name + cmd.help + "\n");
+      }
     });
+    process.stdout.write("\n");
+    process.stdout.write(
+      "See 'meteor help <command>' for details on a command.\n");
+    process.exit(1);
+  };
 
-    if (argv._.length === 1) {
-      appname = argv._[0];
-    } else if (argv._.length === 0 && new_argv.example) {
-      appname = new_argv.example;
-    }
+  var require_project = function (cmd, accept_package) {
+    var app_dir = files.find_upwards(files.is_app_dir);
+    if (app_dir)
+      return app_dir;
 
-    if (new_argv['list']) {
-      process.stdout.write("Available examples:\n");
-      _.each(examples, function (e) {
-        process.stdout.write("  " + e + "\n");
-      });
-      process.stdout.write("\n" +
-"Create a project from an example with 'meteor create --example <name>'.\n")
-      process.exit(1);
-    };
+    var package_dir = files.find_upwards(function (p) {
+      return files.is_package_dir(p) || files.is_package_collection_dir(p);
+    });
+    if (package_dir) {
+      if (accept_package)
+        return package_dir;
 
-    if (argv.help || !appname) {
-      process.stdout.write(opt.help());
+      process.stdout.write(cmd + ": Only works on applications, not packages\n");
       process.exit(1);
     }
 
-    if (fs.existsSync(appname)) {
-      process.stderr.write(appname + ": Already exists\n");
-      process.exit(1);
-    }
+    // This is where you end up if you type 'meteor' with no
+    // args. Be gentle to the noobs..
+    process.stdout.write(
+      cmd + ": You're not in a Meteor project directory.\n" +
+        "\n" +
+        "To create a new Meteor project:\n" +
+        "   meteor create <project name>\n" +
+        "For example:\n" +
+        "   meteor create myapp\n" +
+        "\n" +
+        "For more help, see 'meteor --help'.\n");
+    process.exit(1);
+  };
 
-    if (files.find_app_dir(appname)) {
-      process.stderr.write(
-"You can't create a Meteor project inside another Meteor project.\n");
-      process.exit(1);
-    }
+  var find_mongo_port = function (cmd, callback) {
+    var app_dir = require_project(cmd);
+    var mongo_runner = require(path.join(__dirname, '..', 'lib', 'mongo_runner.js'));
+    mongo_runner.find_mongo_port(app_dir, callback);
+  };
 
-    var transform = function (x) {
-      return x.replace(/~name~/g, path.basename(appname));
-    };
+  Commands = [];
 
-    if (new_argv.example) {
-      if (examples.indexOf(new_argv.example) === -1) {
-        process.stderr.write(new_argv.example + ": no such example\n\n");
-        process.stderr.write("List available applications with 'meteor create --list'.\n");
+  var findCommand = function (name) {
+    for (var i = 0; i < Commands.length; i++)
+      if (Commands[i].name === name)
+        return Commands[i];
+    process.stdout.write("'" + name + "' is not a Meteor command. See " +
+                         "'meteor --help'.\n");
+    process.exit(1);
+  };
+
+  // XXX when the pass unexpected argument or unrecognized flags, print
+  // an error and fail out
+
+  Commands.push({
+    name: "run",
+    help: "[default] Run this project in local development mode",
+    func: function (argv) {
+      // reparse args
+      // This help logic should probably move to run.js eventually
+      var opt = require('optimist')
+            .alias('port', 'p').default('port', 3000)
+            .describe('port', 'Port to listen on. NOTE: Also uses port N+1 and N+2.')
+            .boolean('production')
+            .describe('production', 'Run in production mode. Minify and bundle CSS and JS files.')
+            .describe('settings',  'Set optional data for Meteor.settings on the server')
+            // With --once, meteor does not re-run the project if it crashes and
+            // does not monitor for file changes. Intentionally undocumented:
+            // intended for automated testing (eg, cli-test.sh), not end-user
+            // use.
+            .boolean('once')
+            .usage(
+              "Usage: meteor run [options]\n" +
+                "\n" +
+                "Searches upward from the current directory for the root directory of a\n" +
+                "Meteor project, then runs that project in local development\n" +
+                "mode. You can use the application by pointing your web browser at\n" +
+                "localhost:3000. No internet connection is required.\n" +
+                "\n" +
+                "Whenever you change any of the application's source files, the changes\n" +
+                "are automatically detected and applied to the running application.\n" +
+                "\n" +
+                "The application's database persists between runs. It's stored under\n" +
+                "the .meteor directory in the root of the project.\n");
+
+      var new_argv = opt.argv;
+      var settings = "";
+
+      if (argv.help) {
+        process.stdout.write(opt.help());
         process.exit(1);
+      }
+
+      var app_dir = path.resolve(require_project("run", true)); // app or package
+
+      var bundle_opts = { no_minify: !new_argv.production, symlink_dev_bundle: true };
+      runner.run(app_dir, bundle_opts, new_argv.port, new_argv.once, new_argv.settings);
+    }
+  });
+
+  Commands.push({
+    name: "help",
+    func: function (argv) {
+      if (!argv._.length || argv.help)
+        usage();
+      var cmd = argv._.splice(0,1)[0];
+      argv.help = true;
+      findCommand(cmd).func(argv);
+    }
+  });
+
+  Commands.push({
+    name: "create",
+    help: "Create a new project",
+    func: function (argv) {
+      // reparse args
+      var opt = require('optimist')
+            .describe('example', 'Example template to use.')
+            .boolean('list')
+            .describe('list', 'Show list of available examples.')
+            .usage(
+              "Usage: meteor create <name>\n" +
+                "       meteor create --example <example_name> [<name>]\n" +
+                "       meteor create --list\n" +
+                "\n" +
+                "Make a subdirectory named <name> and create a new Meteor project\n" +
+                "there. You can also pass an absolute or relative path.\n" +
+                "\n" +
+                "You can pass --example to start off with a copy of one of the Meteor\n" +
+                "sample applications. Use --list to see the available examples.");
+
+      var new_argv = opt.argv;
+      var appname;
+
+      var example_dir = path.join(__dirname, '..', '..', 'examples');
+      var examples = _.reject(fs.readdirSync(example_dir), function (e) {
+        return (e === 'unfinished' || e === 'other');
+      });
+
+      if (argv._.length === 1) {
+        appname = argv._[0];
+      } else if (argv._.length === 0 && new_argv.example) {
+        appname = new_argv.example;
+      }
+
+      if (new_argv['list']) {
+        process.stdout.write("Available examples:\n");
+        _.each(examples, function (e) {
+          process.stdout.write("  " + e + "\n");
+        });
+        process.stdout.write("\n" +
+                             "Create a project from an example with 'meteor create --example <name>'.\n")
+        process.exit(1);
+      };
+
+      if (argv.help || !appname) {
+        process.stdout.write(opt.help());
+        process.exit(1);
+      }
+
+      if (fs.existsSync(appname)) {
+        process.stderr.write(appname + ": Already exists\n");
+        process.exit(1);
+      }
+
+      if (files.find_app_dir(appname)) {
+        process.stderr.write(
+          "You can't create a Meteor project inside another Meteor project.\n");
+        process.exit(1);
+      }
+
+      var transform = function (x) {
+        return x.replace(/~name~/g, path.basename(appname));
+      };
+
+      if (new_argv.example) {
+        if (examples.indexOf(new_argv.example) === -1) {
+          process.stderr.write(new_argv.example + ": no such example\n\n");
+          process.stderr.write("List available applications with 'meteor create --list'.\n");
+          process.exit(1);
+        } else {
+          files.cp_r(path.join(example_dir, new_argv.example), appname, {
+            ignore: [/^local$/]
+          });
+        }
       } else {
-        files.cp_r(path.join(example_dir, new_argv.example), appname, {
+        files.cp_r(path.join(__dirname, 'skel'), appname, {
+          transform_filename: function (f) {
+            return transform(f);
+          },
+          transform_contents: function (contents, f) {
+            if ((/(\.html|\.js|\.css)/).test(f))
+              return new Buffer(transform(contents.toString()));
+            else
+              return contents;
+          },
           ignore: [/^local$/]
         });
       }
-    } else {
-      files.cp_r(path.join(__dirname, 'skel'), appname, {
-        transform_filename: function (f) {
-          return transform(f);
-        },
-        transform_contents: function (contents, f) {
-          if ((/(\.html|\.js|\.css)/).test(f))
-            return new Buffer(transform(contents.toString()));
-          else
-            return contents;
-        },
-        ignore: [/^local$/]
-      });
+
+      process.stderr.write(appname + ": created");
+      if (new_argv.example &&
+          new_argv.example !== appname)
+        process.stderr.write(" (from '" + new_argv.example + "' template)");
+      process.stderr.write(".\n\n");
+
+      process.stderr.write(
+        "To run your new app:\n" +
+          "   cd " + appname + "\n" +
+          "   meteor\n");
     }
+  });
 
-    process.stderr.write(appname + ": created");
-    if (new_argv.example &&
-        new_argv.example !== appname)
-      process.stderr.write(" (from '" + new_argv.example + "' template)");
-    process.stderr.write(".\n\n");
-
-    process.stderr.write(
-"To run your new app:\n" +
-"   cd " + appname + "\n" +
-"   meteor\n");
-  }
-});
-
-Commands.push({
-  name: "update",
-  help: "Upgrade to the latest version of Meteor",
-  func: function (argv) {
-    if (argv.help) {
-      process.stdout.write(
-"Usage: meteor update\n" +
-"\n" +
-"Checks to see if a new version of Meteor is available, and if so,\n" +
-"downloads and installs it. You must be connected to the internet.\n");
-      process.exit(1);
-    }
-
-    require(path.join(__dirname, 'update.js'));
-  }
-});
-
-Commands.push({
-  name: "add",
-  help: "Add a package to this project",
-  func: function (argv) {
-    if (argv.help || !argv._.length) {
-      process.stdout.write(
-"Usage: meteor add <package> [package] [package..]\n" +
-"\n" +
-"Adds packages to your Meteor project. You can add multiple\n" +
-"packages with one command. For a list of the available packages, see\n" +
-"'meteor list'.\n");
-      process.exit(1);
-    }
-
-    var app_dir = require_project('add');
-    var packages = require(path.join(__dirname, '..', 'lib', 'packages.js'));
-    var project = require(path.join(__dirname, '..', 'lib', 'project.js'));
-    var all = packages.list();
-    var using = {};
-    _.each(project.get_packages(app_dir), function (name) {
-      using[name] = true;
-    });
-
-    _.each(argv._, function (name) {
-      if (!(name in all)) {
-        process.stderr.write(name + ": no such package\n");
-      } else if (name in using) {
-        process.stderr.write(name + ": already using\n");
-      } else {
-        project.add_package(app_dir, name);
-        var note = all[name].metadata.summary || '';
-        process.stderr.write(name + ": " + note + "\n");
-      }
-    });
-  }
-});
-
-Commands.push({
-  name: "remove",
-  help: "Remove a package from this project",
-  func: function (argv) {
-    if (argv.help || !argv._.length) {
-      process.stdout.write(
-"Usage: meteor remove <package> [package] [package..]\n" +
-"\n" +
-"Removes a package previously added to your Meteor project. For a\n" +
-"list of the packages that your application is currently using, see\n" +
-"'meteor list --using'.\n");
-      process.exit(1);
-    }
-
-    var app_dir = require_project('remove');
-    var packages = require(path.join(__dirname, '..', 'lib', 'packages.js'));
-    var project = require(path.join(__dirname, '..', 'lib', 'project.js'));
-    var using = {};
-    _.each(project.get_packages(app_dir), function (name) {
-      using[name] = true;
-    });
-
-    _.each(argv._, function (name) {
-      if (!(name in using)) {
-        process.stderr.write(name + ": not in project\n");
-      } else {
-        project.remove_package(app_dir, name);
-        process.stderr.write(name + ": removed\n");
-      }
-    });
-  }
-});
-
-Commands.push({
-  name: "list",
-  help: "List available packages",
-  func: function (argv) {
-    if (argv.help) {
-      process.stdout.write(
-"Usage: meteor list [--using]\n" +
-"\n" +
-"Without arguments, lists all available Meteor packages. To add one\n" +
-"of these packages to your project, see 'meteor add'.\n" +
-"\n" +
-"With --using, list the packages that you have added to your project.\n");
-      process.exit(1);
-    }
-
-    if (argv.using) {
-      var app_dir = require_project('list --using');
-      var using = require(path.join(__dirname, '..', 'lib', 'project.js')).get_packages(app_dir);
-
-      if (using.length) {
-        _.each(using, function (name) {
-          process.stdout.write(name + "\n");
-        });
-      } else {
-        process.stderr.write(
-"This project doesn't use any packages yet. To add some packages:\n" +
-"  meteor add <package> <package> ...\n" +
-"\n" +
-"To see available packages:\n" +
-"  meteor list\n");
-      }
-      return;
-    }
-
-    var list = require(path.join(__dirname, '..', 'lib', 'packages.js')).list();
-    var names = _.keys(list);
-    names.sort();
-    var pkgs = [];
-    _.each(names, function (name) {
-      pkgs.push(list[name]);
-    });
-    process.stdout.write("\n" +
-                         require(path.join(__dirname, '..', 'lib', 'packages.js')).format_list(pkgs) +
-                         "\n");
-  }
-});
-
-Commands.push({
-  name: "bundle",
-  help: "Pack this project up into a tarball",
-  func: function (argv) {
-    if (argv.help || argv._.length != 1) {
-      process.stdout.write(
-"Usage: meteor bundle <output_file.tar.gz>\n" +
-"\n" +
-"Package this project up for deployment. The output is a tarball that\n" +
-"includes everything necessary to run the application. See README in\n" +
-"the tarball for details.\n");
-      process.exit(1);
-    }
-
-    // XXX if they pass a file that doesn't end in .tar.gz or .tgz,
-    // add the former for them
-
-    // XXX output, to stderr, the name of the file written to (for
-    // human comfort, especially since we might change the name)
-
-    // XXX name the root directory in the bundle based on the basename
-    // of the file, not a constant 'bundle' (a bit obnoxious for
-    // machines, but worth it for humans)
-
-    var app_dir = path.resolve(require_project("bundle"));
-    var build_dir = path.join(app_dir, '.meteor', 'local', 'build_tar');
-    var bundle_path = path.join(build_dir, 'bundle');
-    var output_path = path.resolve(argv._[0]); // get absolute path
-
-    var bundler = require(path.join(__dirname, '..', 'lib', 'bundler.js'));
-    var errors = bundler.bundle(app_dir, bundle_path);
-    if (errors) {
-      process.stdout.write("Errors prevented bundling:\n");
-      _.each(errors, function (e) {
-        process.stdout.write(e + "\n");
-      });
-      files.rm_recursive(build_dir);
-      process.exit(1);
-    }
-
-    var cp = require('child_process');
-    cp.execFile('/usr/bin/env',
-                ['tar', 'czf', output_path, 'bundle'],
-                {cwd: build_dir},
-                function (error, stdout, stderr) {
-                  if (error !== null) {
-                    console.log(JSON.stringify(error));
-                    process.stderr.write("couldn't run tar\n");
-                  } else {
-                    process.stdout.write(stdout);
-                    process.stderr.write(stderr);
-                  }
-                  files.rm_recursive(build_dir);
-                });
-  }
-});
-
-Commands.push({
-  name: "mongo",
-  help: "Connect to the Mongo database for the specified site",
-  func: function (argv) {
-    var opt = require('optimist')
-      .boolean('url')
-      .boolean('U')
-      .alias('url', 'U')
-      .describe('url', 'return a Mongo database URL')
-      .usage(
-"Usage: meteor mongo [--url] [site]\n" +
-"\n" +
-"Opens a Mongo shell to view or manipulate collections.\n" +
-"\n" +
-"If site is specified, this is the hosted Mongo database for the deployed\n" +
-"Meteor site.\n" +
-"\n" +
-"If no site is specified, this is the current project's local development\n" +
-"database.  In this case, the current working directory must be a\n" +
-"Meteor project directory, and the Meteor application must already be\n" +
-"running.\n" +
-"\n" +
-"Instead of opening a shell, specifying --url (-U) will return a URL\n" +
-"suitable for an external program to connect to the database.  For remote\n" +
-"databases on deployed applications, the URL is valid for one minute.\n"
-      );
-
-    if (argv.help) {
-      process.stdout.write(opt.help());
-      process.exit(1);
-    }
-
-    new_argv = opt.argv;
-
-    if (new_argv._.length === 1) {
-      // localhost mode
-      find_mongo_port("mongo", function (mongod_port) {
-        if (!mongod_port) {
-          process.stdout.write(
-"mongo: Meteor isn't running.\n" +
-"\n" +
-"This command only works while Meteor is running your application\n" +
-"locally. Start your application first.\n");
-          process.exit(1);
-        }
-
-        var mongo_url = "mongodb://127.0.0.1:" + mongod_port + "/meteor";
-
-        if (new_argv.url)
-          console.log(mongo_url)
-        else
-          deploy.run_mongo_shell(mongo_url);
-      });
-
-    } else if (new_argv._.length === 2) {
-      // remote mode
-      deploy.mongo(new_argv._[1], new_argv.url);
-
-    } else {
-      // usage
-      process.stdout.write(opt.help());
-      process.exit(1);
-    }
-  }
-});
-
-Commands.push({
-  name: "deploy",
-  help: "Deploy this project to Meteor",
-  func: function (argv) {
-    var opt = require('optimist')
-      .alias('password', 'P')
-      .boolean('password')
-      .boolean('P')
-      .describe('password', 'set a password for this deployment')
-      .alias('delete', 'D')
-      .boolean('delete')
-      .boolean('D')
-      .describe('delete', "permanently delete this deployment")
-      .boolean('debug')
-      .describe('debug', 'deploy in debug mode (don\'t minify, etc)')
-      .boolean('tests')
-//      .describe('tests', 'deploy the tests instead of the actual application')
-      .usage(
-        // XXX document --tests in the future, once we publicly
-        // support tests
-"Usage: meteor deploy <site> [--password] [--delete] [--debug]\n" +
-"\n" +
-"Deploys the project in your current directory to Meteor's servers.\n" +
-"\n" +
-"You can deploy to any available name under 'meteor.com'\n" +
-"without any additional configuration, for example,\n" +
-"'myapp.meteor.com'.  If you deploy to a custom domain, such as\n" +
-"'myapp.mydomain.com', then you'll also need to configure your domain's\n" +
-"DNS records.  See the Meteor docs for details.\n" +
-"\n" +
-"The --delete flag permanently removes a deployed application, including\n" +
-"all of its stored data.\n" +
-"\n" +
-"The --password flag sets an administrative password for the domain.  Once\n" +
-"set, any subsequent 'deploy', 'logs', or 'mongo' command will prompt for\n" +
-"the password.  You can change the password with a second 'deploy' command."
-      );
-
-    new_argv = opt.argv;
-
-    if (argv.help || new_argv._.length != 2) {
-      process.stdout.write(opt.help());
-      process.exit(1);
-    }
-
-    if (new_argv.delete) {
-      deploy.delete_app(new_argv._[1]);
-    } else {
-      // accept packages iff we're deploying tests
-      var project_dir = path.resolve(require_project("bundle", new_argv.tests));
-      deploy.deploy_app(new_argv._[1], project_dir, new_argv.debug,
-                        new_argv.tests, new_argv.password);
-    }
-  }
-});
-
-Commands.push({
-  name: "logs",
-  help: "Show logs for specified site",
-  func: function (argv) {
-    if (argv.help || argv._.length < 1 || argv._.length > 2) {
-      process.stdout.write(
-"Usage: meteor logs <site>\n" +
-"\n" +
-"Retrieves the server logs for the requested site.\n");
-      process.exit(1);
-    }
-
-    deploy.logs(argv._[0]);
-  }
-});
-
-Commands.push({
-  name: "reset",
-  help: "Reset the project state. Erases the local database.",
-  func: function (argv) {
-    if (argv.help) {
-      process.stdout.write(
-"Usage: meteor reset\n" +
-"\n" +
-"Reset the current project to a fresh state. Removes all local\n" +
-"data and kills any running meteor development servers.\n");
-      process.exit(1);
-    }
-
-    var app_dir = path.resolve(require_project("reset"));
-
-    find_mongo_port("reset", function (mongod_port) {
-      if (mongod_port) {
+  Commands.push({
+    name: "update",
+    help: "Upgrade to the latest version of Meteor",
+    func: function (argv) {
+      if (argv.help) {
         process.stdout.write(
-"reset: Meteor is running.\n" +
-"\n" +
-"This command does not work while Meteor is running your application.\n" +
-"Exit the running meteor development server.\n");
+          "Usage: meteor update\n" +
+            "\n" +
+            "Checks to see if a new version of Meteor is available, and if so,\n" +
+            "downloads and installs it. You must be connected to the internet.\n");
         process.exit(1);
       }
 
-      var local_dir = path.join(app_dir, '.meteor', 'local');
-      files.rm_recursive(local_dir);
+      require(path.join(__dirname, 'update.js'));
+    }
+  });
 
-      process.stdout.write("Project reset.\n");
-    });
-  }
-});
+  Commands.push({
+    name: "add",
+    help: "Add a package to this project",
+    func: function (argv) {
+      if (argv.help || !argv._.length) {
+        process.stdout.write(
+          "Usage: meteor add <package> [package] [package..]\n" +
+            "\n" +
+            "Adds packages to your Meteor project. You can add multiple\n" +
+            "packages with one command. For a list of the available packages, see\n" +
+            "'meteor list'.\n");
+        process.exit(1);
+      }
+
+      var app_dir = require_project('add');
+      var packages = require(path.join(__dirname, '..', 'lib', 'packages.js'));
+      var project = require(path.join(__dirname, '..', 'lib', 'project.js'));
+      var all = packages.list();
+      var using = {};
+      _.each(project.get_packages(app_dir), function (name) {
+        using[name] = true;
+      });
+
+      _.each(argv._, function (name) {
+        if (!(name in all)) {
+          process.stderr.write(name + ": no such package\n");
+        } else if (name in using) {
+          process.stderr.write(name + ": already using\n");
+        } else {
+          project.add_package(app_dir, name);
+          var note = all[name].metadata.summary || '';
+          process.stderr.write(name + ": " + note + "\n");
+        }
+      });
+    }
+  });
+
+  Commands.push({
+    name: "remove",
+    help: "Remove a package from this project",
+    func: function (argv) {
+      if (argv.help || !argv._.length) {
+        process.stdout.write(
+          "Usage: meteor remove <package> [package] [package..]\n" +
+            "\n" +
+            "Removes a package previously added to your Meteor project. For a\n" +
+            "list of the packages that your application is currently using, see\n" +
+            "'meteor list --using'.\n");
+        process.exit(1);
+      }
+
+      var app_dir = require_project('remove');
+      var packages = require(path.join(__dirname, '..', 'lib', 'packages.js'));
+      var project = require(path.join(__dirname, '..', 'lib', 'project.js'));
+      var using = {};
+      _.each(project.get_packages(app_dir), function (name) {
+        using[name] = true;
+      });
+
+      _.each(argv._, function (name) {
+        if (!(name in using)) {
+          process.stderr.write(name + ": not in project\n");
+        } else {
+          project.remove_package(app_dir, name);
+          process.stderr.write(name + ": removed\n");
+        }
+      });
+    }
+  });
+
+  Commands.push({
+    name: "list",
+    help: "List available packages",
+    func: function (argv) {
+      if (argv.help) {
+        process.stdout.write(
+          "Usage: meteor list [--using]\n" +
+            "\n" +
+            "Without arguments, lists all available Meteor packages. To add one\n" +
+            "of these packages to your project, see 'meteor add'.\n" +
+            "\n" +
+            "With --using, list the packages that you have added to your project.\n");
+        process.exit(1);
+      }
+
+      if (argv.using) {
+        var app_dir = require_project('list --using');
+        var using = require(path.join(__dirname, '..', 'lib', 'project.js')).get_packages(app_dir);
+
+        if (using.length) {
+          _.each(using, function (name) {
+            process.stdout.write(name + "\n");
+          });
+        } else {
+          process.stderr.write(
+            "This project doesn't use any packages yet. To add some packages:\n" +
+              "  meteor add <package> <package> ...\n" +
+              "\n" +
+              "To see available packages:\n" +
+              "  meteor list\n");
+        }
+        return;
+      }
+
+      var list = require(path.join(__dirname, '..', 'lib', 'packages.js')).list();
+      var names = _.keys(list);
+      names.sort();
+      var pkgs = [];
+      _.each(names, function (name) {
+        pkgs.push(list[name]);
+      });
+      process.stdout.write("\n" +
+                           require(path.join(__dirname, '..', 'lib', 'packages.js')).format_list(pkgs) +
+                           "\n");
+    }
+  });
+
+  Commands.push({
+    name: "bundle",
+    help: "Pack this project up into a tarball",
+    func: function (argv) {
+      if (argv.help || argv._.length != 1) {
+        process.stdout.write(
+          "Usage: meteor bundle <output_file.tar.gz>\n" +
+            "\n" +
+            "Package this project up for deployment. The output is a tarball that\n" +
+            "includes everything necessary to run the application. See README in\n" +
+            "the tarball for details.\n");
+        process.exit(1);
+      }
+
+      // XXX if they pass a file that doesn't end in .tar.gz or .tgz,
+      // add the former for them
+
+      // XXX output, to stderr, the name of the file written to (for
+      // human comfort, especially since we might change the name)
+
+      // XXX name the root directory in the bundle based on the basename
+      // of the file, not a constant 'bundle' (a bit obnoxious for
+      // machines, but worth it for humans)
+
+      var app_dir = path.resolve(require_project("bundle"));
+      var build_dir = path.join(app_dir, '.meteor', 'local', 'build_tar');
+      var bundle_path = path.join(build_dir, 'bundle');
+      var output_path = path.resolve(argv._[0]); // get absolute path
+
+      var bundler = require(path.join(__dirname, '..', 'lib', 'bundler.js'));
+      var errors = bundler.bundle(app_dir, bundle_path);
+      if (errors) {
+        process.stdout.write("Errors prevented bundling:\n");
+        _.each(errors, function (e) {
+          process.stdout.write(e + "\n");
+        });
+        files.rm_recursive(build_dir);
+        process.exit(1);
+      }
+
+      var cp = require('child_process');
+      cp.execFile('/usr/bin/env',
+                  ['tar', 'czf', output_path, 'bundle'],
+                  {cwd: build_dir},
+                  function (error, stdout, stderr) {
+                    if (error !== null) {
+                      console.log(JSON.stringify(error));
+                      process.stderr.write("couldn't run tar\n");
+                    } else {
+                      process.stdout.write(stdout);
+                      process.stderr.write(stderr);
+                    }
+                    files.rm_recursive(build_dir);
+                  });
+    }
+  });
+
+  Commands.push({
+    name: "mongo",
+    help: "Connect to the Mongo database for the specified site",
+    func: function (argv) {
+      var opt = require('optimist')
+            .boolean('url')
+            .boolean('U')
+            .alias('url', 'U')
+            .describe('url', 'return a Mongo database URL')
+            .usage(
+              "Usage: meteor mongo [--url] [site]\n" +
+                "\n" +
+                "Opens a Mongo shell to view or manipulate collections.\n" +
+                "\n" +
+                "If site is specified, this is the hosted Mongo database for the deployed\n" +
+                "Meteor site.\n" +
+                "\n" +
+                "If no site is specified, this is the current project's local development\n" +
+                "database.  In this case, the current working directory must be a\n" +
+                "Meteor project directory, and the Meteor application must already be\n" +
+                "running.\n" +
+                "\n" +
+                "Instead of opening a shell, specifying --url (-U) will return a URL\n" +
+                "suitable for an external program to connect to the database.  For remote\n" +
+                "databases on deployed applications, the URL is valid for one minute.\n"
+            );
+
+      if (argv.help) {
+        process.stdout.write(opt.help());
+        process.exit(1);
+      }
+
+      var new_argv = opt.argv;
+
+      if (new_argv._.length === 1) {
+        // localhost mode
+        find_mongo_port("mongo", function (mongod_port) {
+          if (!mongod_port) {
+            process.stdout.write(
+              "mongo: Meteor isn't running.\n" +
+                "\n" +
+                "This command only works while Meteor is running your application\n" +
+                "locally. Start your application first.\n");
+            process.exit(1);
+          }
+
+          var mongo_url = "mongodb://127.0.0.1:" + mongod_port + "/meteor";
+
+          if (new_argv.url)
+            console.log(mongo_url);
+          else
+            deploy.run_mongo_shell(mongo_url);
+        });
+
+      } else if (new_argv._.length === 2) {
+        // remote mode
+        deploy.mongo(new_argv._[1], new_argv.url);
+
+      } else {
+        // usage
+        process.stdout.write(opt.help());
+        process.exit(1);
+      }
+    }
+  });
+
+  Commands.push({
+    name: "deploy",
+    help: "Deploy this project to Meteor",
+    func: function (argv) {
+      var opt = require('optimist')
+            .alias('password', 'P')
+            .boolean('password')
+            .boolean('P')
+            .describe('password', 'set a password for this deployment')
+            .alias('delete', 'D')
+            .boolean('delete')
+            .boolean('D')
+            .describe('delete', "permanently delete this deployment")
+            .boolean('debug')
+            .describe('debug', 'deploy in debug mode (don\'t minify, etc)')
+            .boolean('tests')
+            .describe('settings', 'set optional data for Meteor.settings on the server')
+      //      .describe('tests', 'deploy the tests instead of the actual application')
+            .usage(
+              // XXX document --tests in the future, once we publicly
+              // support tests
+              "Usage: meteor deploy <site> [--password] [--settings settings.json] [--debug] [--delete]\n" +
+                "\n" +
+                "Deploys the project in your current directory to Meteor's servers.\n" +
+                "\n" +
+                "You can deploy to any available name under 'meteor.com'\n" +
+                "without any additional configuration, for example,\n" +
+                "'myapp.meteor.com'.  If you deploy to a custom domain, such as\n" +
+                "'myapp.mydomain.com', then you'll also need to configure your domain's\n" +
+                "DNS records.  See the Meteor docs for details.\n" +
+                "\n" +
+                "The --settings flag can be used to pass deploy-specific information to\n" +
+                "the application. It will be available at runtime in Meteor.settings, but only\n" +
+                "on the server. The argument is the name of a file containing the JSON data\n" +
+                "to use.  The settings will persist across deployments until you again specify\n" +
+                "a settings file.  To unset Meteor.settings, pass an empty settings file.\n" +
+                "\n" +
+                "The --delete flag permanently removes a deployed application, including\n" +
+                "all of its stored data.\n" +
+                "\n" +
+                "The --password flag sets an administrative password for the domain.  Once\n" +
+                "set, any subsequent 'deploy', 'logs', or 'mongo' command will prompt for\n" +
+                "the password.  You can change the password with a second 'deploy' command."
+            );
+
+      var new_argv = opt.argv;
+
+      if (argv.help || new_argv._.length != 2) {
+        process.stdout.write(opt.help());
+        process.exit(1);
+      }
+
+      if (new_argv.delete) {
+        deploy.delete_app(new_argv._[1]);
+      } else {
+        var settings = undefined;
+        if (new_argv.settings)
+          settings = runner.getSettings(new_argv.settings);
+        // accept packages iff we're deploying tests
+        var project_dir = path.resolve(require_project("bundle", new_argv.tests));
+        deploy.deploy_app(new_argv._[1], project_dir, new_argv.debug,
+                          new_argv.tests, new_argv.password, settings);
+      }
+    }
+  });
+
+  Commands.push({
+    name: "logs",
+    help: "Show logs for specified site",
+    func: function (argv) {
+      if (argv.help || argv._.length < 1 || argv._.length > 2) {
+        process.stdout.write(
+          "Usage: meteor logs <site>\n" +
+            "\n" +
+            "Retrieves the server logs for the requested site.\n");
+        process.exit(1);
+      }
+
+      deploy.logs(argv._[0]);
+    }
+  });
+
+  Commands.push({
+    name: "reset",
+    help: "Reset the project state. Erases the local database.",
+    func: function (argv) {
+      if (argv.help) {
+        process.stdout.write(
+          "Usage: meteor reset\n" +
+            "\n" +
+            "Reset the current project to a fresh state. Removes all local\n" +
+            "data and kills any running meteor development servers.\n");
+        process.exit(1);
+      } else if (!_.isEmpty(argv._)) {
+        process.stdout.write("meteor reset only affects the locally stored database.\n\n" +
+                             "To reset a deployed application use\nmeteor deploy --delete appname\n" +
+                             "followed by\nmeteor deploy appname\n");
+        process.exit(1);
+      }
+
+      var app_dir = path.resolve(require_project("reset"));
+
+      find_mongo_port("reset", function (mongod_port) {
+        if (mongod_port) {
+          process.stdout.write(
+            "reset: Meteor is running.\n" +
+              "\n" +
+              "This command does not work while Meteor is running your application.\n" +
+              "Exit the running meteor development server.\n");
+          process.exit(1);
+        }
+
+        var local_dir = path.join(app_dir, '.meteor', 'local');
+        files.rm_recursive(local_dir);
+
+        process.stdout.write("Project reset.\n");
+      });
+    }
+  });
 
 
-var main = function() {
-  var optimist = require('optimist')
-    .alias("h", "help")
-    .boolean("h")
-    .boolean("help")
-    .boolean("version")
-    .boolean("debug");
+  var main = function() {
+    var optimist = require('optimist')
+          .alias("h", "help")
+          .boolean("h")
+          .boolean("help")
+          .boolean("version")
+          .boolean("debug");
 
-  var argv = optimist.argv;
+    var argv = optimist.argv;
 
-  if (argv.help) {
-    argv._.splice(0, 0, "help");
-    delete argv.help;
-  }
+    if (argv.help) {
+      argv._.splice(0, 0, "help");
+      delete argv.help;
+    }
 
-  if (argv.version) {
-    var updater = require(path.join(__dirname, '..', 'lib', 'updater.js'));
-    var sha = updater.git_sha();
+    if (argv.version) {
+      var updater = require(path.join(__dirname, '..', 'lib', 'updater.js'));
+      var sha = updater.git_sha();
 
-    process.stdout.write("Meteor version " + updater.CURRENT_VERSION);
+      process.stdout.write("Meteor version " + updater.CURRENT_VERSION);
 
-    if (files.in_checkout())
-      process.stdout.write(" (git checkout)");
-    else if (sha)
-      process.stdout.write(" (" + sha.substr(0, 10) + ")");
+      if (files.in_checkout())
+        process.stdout.write(" (git checkout)");
+      else if (sha)
+        process.stdout.write(" (" + sha.substr(0, 10) + ")");
 
-    process.stdout.write("\n");
-    process.exit(0);
-  }
+      process.stdout.write("\n");
+      process.exit(0);
+    }
 
-  var cmd = 'run';
-  if (argv._.length)
-    cmd = argv._.splice(0,1)[0];
+    var cmd = 'run';
+    if (argv._.length)
+      cmd = argv._.splice(0,1)[0];
 
-  findCommand(cmd).func(argv);
-};
-
-main();
+    findCommand(cmd).func(argv);
+  };
 
+  main();
+}).run();
diff --git a/app/meteor/post-upgrade.js b/app/meteor/post-upgrade.js
index 625d07cc6a..036dca5d17 100644
--- a/app/meteor/post-upgrade.js
+++ b/app/meteor/post-upgrade.js
@@ -2,13 +2,13 @@ try {
   // XXX can't get this from updater.js because in 0.3.7 and before the
   // updater didn't have the right NODE_PATH set. At some point we can
   // remove this and just use updater.CURRENT_VERSION.
-  var VERSION = "0.5.2";
+  var VERSION = "0.5.3";
 
   var fs = require('fs');
   var path = require('path');
   var files = require(path.join(__dirname, "..", "lib", "files.js"));
 
-  var _ = require(path.join(__dirname, "..", "lib", "third", "underscore.js"));
+  var _ = require('underscore');
 
   var topDir = files.get_dev_bundle();
   var changelogPath = path.join(topDir, 'History.md');
diff --git a/app/meteor/run.js b/app/meteor/run.js
index e542b90c53..2a02fd3007 100644
--- a/app/meteor/run.js
+++ b/app/meteor/run.js
@@ -10,10 +10,12 @@ var files = require(path.join(__dirname, '..', 'lib', 'files.js'));
 var updater = require(path.join(__dirname, '..', 'lib', 'updater.js'));
 var bundler = require(path.join(__dirname, '..', 'lib', 'bundler.js'));
 var mongo_runner = require(path.join(__dirname, '..', 'lib', 'mongo_runner.js'));
+var mongoExitCodes = require(path.join(__dirname, '..', 'lib', 'mongo_exit_codes.js'));
 
-var _ = require(path.join(__dirname, '..', 'lib', 'third', 'underscore.js'));
+var _ = require('underscore');
 
 ////////// Globals //////////
+//XXX: Refactor to not have globals anymore?
 
 // list of log objects from the child process.
 var server_log = [];
@@ -23,18 +25,42 @@ var Status = {
   crashing: false, // does server crash whenever we start it?
   listening: false, // do we expect the server to be listening now.
   counter: 0, // how many crashes in rapid succession
+  code: 0, // exit code last returned
+  shouldRestart: true, // true if we should be restarting the server
+  shuttingDown: false, // true if we're on the way to shutting down the server
 
+  exitNow: function () {
+    var self = this;
+    log_to_clients({'exit': "Your application is exiting."});
+    self.shuttingDown = true;
+
+    self.mongoHandle && self.mongoHandle.stop(function (err) {
+      if (err)
+        process.stdout.write(err.reason + "\n");
+      process.exit(self.code);
+    });
+  },
   reset: function () {
     this.crashing = false;
     this.counter = 0;
   },
 
   hard_crashed: function () {
+    var self = this;
+    if (!self.shouldRestart) {
+      self.exitNow();
+      return;
+    }
     log_to_clients({'exit': "Your application is crashing. Waiting for file change."});
     this.crashing = true;
   },
 
   soft_crashed: function () {
+    var self = this;
+    if (!self.shouldRestart) {
+      self.exitNow();
+      return;
+    }
     if (this.counter === 0)
       setTimeout(function () {
         this.counter = 0;
@@ -48,6 +74,18 @@ var Status = {
   }
 };
 
+// Parse out s as if it were a bash command line.
+var bashParse = function (s) {
+  if (s.search("\"") !== -1 || s.search("'") !== -1) {
+    throw new Error("Meteor cannot currently handle quoted NODE_OPTIONS");
+  }
+  return _.without(s.split(/\s+/), '');
+};
+
+var getNodeOptionsFromEnvironment = function () {
+  return bashParse(process.env.NODE_OPTIONS || "");
+};
+
 // List of queued requests. Each item in the list is a function to run
 // when the inner app is ready to receive connections.
 var request_queue = [];
@@ -167,19 +205,48 @@ var log_to_clients = function (msg) {
 };
 
 ////////// Launch server process //////////
+// Takes options:
+// bundlePath
+// outerPort
+// innerPort
+// mongoURL
+// onExit
+// [onListen]
+// [nodeOptions]
+// [runOnce]: boolean; default false; if true doesn't ever try to restart, and
+//          forwards server exit code.
+// [settingsFile]
 
-var start_server = function (bundle_path, outer_port, inner_port, mongo_url,
-                             on_exit_callback, on_listen_callback) {
+var start_server = function (options) {
   // environment
+  options = _.extend({
+    runOnce: false,
+    nodeOptions: []
+  }, options);
+  if (options.runOnce) {
+    Status.shouldRestart = false;
+  }
+
   var env = {};
   for (var k in process.env)
     env[k] = process.env[k];
-  env.PORT = inner_port;
-  env.MONGO_URL = mongo_url;
-  env.ROOT_URL = env.ROOT_URL || ('http://localhost:' + outer_port);
+
+  env.PORT = options.innerPort;
+  env.MONGO_URL = options.mongoURL;
+  env.ROOT_URL = env.ROOT_URL || ('http://localhost:' + options.outerPort);
+  if (options.settingsFile) {
+    // Re-read the settings file each time we call start_server.
+    var settings = exports.getSettings(options.settingsFile);
+    if (settings)
+      env.METEOR_SETTINGS = settings;
+  }
+
+  var nodeOptions = _.clone(options.nodeOptions);
+  nodeOptions.push(path.join(options.bundlePath, 'main.js'));
+  nodeOptions.push('--keepalive');
 
   var proc = spawn(process.execPath,
-                   [path.join(bundle_path, 'main.js'), '--keepalive'],
+                   nodeOptions,
                    {env: env});
 
   // XXX deal with test server logging differently?!
@@ -192,7 +259,7 @@ var start_server = function (bundle_path, outer_port, inner_port, mongo_url,
     // string must match server.js
     data = data.replace(/^LISTENING\s*(?:\n|$)/m, '');
     if (data.length != originalLength)
-      on_listen_callback && on_listen_callback();
+      options.onListen && options.onListen();
     if (data)
       log_to_clients({stdout: data});
   });
@@ -209,7 +276,7 @@ var start_server = function (bundle_path, outer_port, inner_port, mongo_url,
       log_to_clients({'exit': 'Exited with code: ' + code});
     }
 
-    on_exit_callback();
+    options.onExit(code);
   });
 
   // this happens sometimes when we write a keepalive after the app is
@@ -245,8 +312,11 @@ var kill_server = function (handle) {
 ////////// Watching dependencies  //////////
 
 // deps is the data from dependencies.json in the bundle
+// app_dir is the root of the app
+// relativeFiles are any other files to watch, relative to the current
+//   directory (eg, the --settings file)
 // on_change is only fired once
-var DependencyWatcher = function (deps, app_dir, on_change) {
+var DependencyWatcher = function (deps, app_dir, relativeFiles, on_change) {
   var self = this;
 
   self.app_dir = app_dir;
@@ -279,6 +349,10 @@ var DependencyWatcher = function (deps, app_dir, on_change) {
     });
   };
 
+  _.each(relativeFiles, function (file) {
+    self.specific_files[file] = true;
+  });
+
   // Things that are never interesting.
   self.exclude_patterns = _.map((deps.exclude || []), function (pattern) {
     return new RegExp(pattern);
@@ -310,7 +384,7 @@ _.extend(DependencyWatcher.prototype, {
       return false;
 
     try {
-      var stats = fs.lstatSync(filepath)
+      var stats = fs.lstatSync(filepath);
     } catch (e) {
       // doesn't exist -- leave stats undefined
     }
@@ -444,12 +518,34 @@ var start_update_checks = function () {
 
 ///////////////////////////////////////////////////////////////////////////////
 
+// Also used by "meteor deploy" in meteor.js.
+
+exports.getSettings = function (filename) {
+  var str;
+  try {
+    str = fs.readFileSync(filename, "utf8");
+  } catch (e) {
+    throw new Error("Could not find settings file " + filename);
+  }
+  if (str.length > 0x10000) {
+    throw new Error("Settings file must be less than 64 KB long");
+  }
+  // Ensure that the string is parseable in JSON, but there's
+  // no reason to use the object value of it yet.
+  if (str.match(/\S/)) {
+    JSON.parse(str);
+    return str;
+  } else {
+    return "";
+  }
+};
+
 // XXX leave a pidfile and check if we are already running
 
 // This function never returns and will call process.exit() if it
 // can't continue. If you change this, remember to call
 // watcher.destroy() as appropriate.
-exports.run = function (app_dir, bundle_opts, port) {
+exports.run = function (app_dir, bundle_opts, port, once, settingsFile) {
   var outer_port = port || 3000;
   var inner_port = outer_port + 1;
   var mongo_port = outer_port + 2;
@@ -462,6 +558,7 @@ exports.run = function (app_dir, bundle_opts, port) {
   var test_mongo_url = "mongodb://127.0.0.1:" + mongo_port + "/meteor_test";
 
   var test_bundle_opts;
+
   if (files.is_app_dir(app_dir)) {
     // If we're an app, make separate test_bundle_opts to trigger a
     // separate runner.
@@ -483,11 +580,19 @@ exports.run = function (app_dir, bundle_opts, port) {
   var watcher;
 
   var start_watching = function () {
+    if (!Status.shouldRestart)
+      return;
     if (deps_info) {
       if (watcher)
         watcher.destroy();
 
-      watcher = new DependencyWatcher(deps_info, app_dir, function () {
+      var relativeFiles;
+      if (settingsFile) {
+        relativeFiles = [settingsFile];
+      }
+
+      watcher = new DependencyWatcher(deps_info, app_dir, relativeFiles,
+                                      function () {
         if (Status.crashing)
           log_to_clients({'system': "=> Modified -- restarting."});
         Status.reset();
@@ -546,21 +651,30 @@ exports.run = function (app_dir, bundle_opts, port) {
 
     start_watching();
     Status.running = true;
-    server_handle = start_server(
-      bundle_path, outer_port, inner_port, mongo_url,
-      function () {
+    server_handle = start_server({
+      bundlePath: bundle_path,
+      outerPort: outer_port,
+      innerPort: inner_port,
+      mongoURL: mongo_url,
+      onExit: function (code) {
         // on server exit
         Status.running = false;
         Status.listening = false;
+        Status.code = code;
         Status.soft_crashed();
         if (!Status.crashing)
           restart_server();
-      }, function () {
+      },
+      onListen: function () {
         // on listen
         Status.listening = true;
         _.each(request_queue, function (f) { f(); });
         request_queue = [];
-      });
+      },
+      nodeOptions: getNodeOptionsFromEnvironment(),
+      runOnce: once,
+      settingsFile: settingsFile
+    });
 
 
     // launch test bundle and server if needed.
@@ -574,12 +688,16 @@ exports.run = function (app_dir, bundle_opts, port) {
         });
         files.rm_recursive(test_bundle_path);
       } else {
-        test_server_handle = start_server(
-          test_bundle_path, test_port, test_mongo_url, function () {
+        test_server_handle = start_server({
+          bundlePath: test_bundle_path,
+          outerPort: test_port,
+          innerPort: test_port,
+          mongoURL: test_mongo_url,
+          onExit: function (code) {
             // No restarting or crash loop prevention on the test server
             // for now. We'll see how annoying it is.
             log_to_clients({'system': "Test server crashed."});
-          });
+          }});
       }
     };
   };
@@ -590,7 +708,7 @@ exports.run = function (app_dir, bundle_opts, port) {
   var mongo_startup_print_timer;
   var process_startup_printer;
   var launch = function () {
-    mongo_runner.launch_mongo(
+    Status.mongoHandle = mongo_runner.launch_mongo(
       app_dir,
       mongo_port,
       function () { // On Mongo startup complete
@@ -607,13 +725,22 @@ exports.run = function (app_dir, bundle_opts, port) {
         restart_server();
       },
       function (code, signal) { // On Mongo dead
+        if (Status.shuttingDown) {
+          return;
+        }
         console.log("Unexpected mongo exit code " + code + ". Restarting.");
 
         // if mongo dies 3 times with less than 5 seconds between each,
         // declare it failed and die.
         mongo_err_count += 1;
         if (mongo_err_count >= 3) {
-          console.log("Can't start mongod. Check for other processes listening on port " + mongo_port + " or other meteors running in the same project.");
+          var explanation = mongoExitCodes.Codes[code];
+          console.log("Can't start mongod\n");
+          if (explanation)
+            console.log(explanation.longText);
+          if (explanation === mongoExitCodes.EXIT_NET_ERROR)
+            console.log("\nCheck for other processes listening on port " + mongo_port +
+                        "\nor other meteors running in the same project.");
           process.exit(1);
         }
         if (mongo_err_timer)
diff --git a/app/meteor/update.js b/app/meteor/update.js
index 8371dfc97e..f2dffb7e8f 100644
--- a/app/meteor/update.js
+++ b/app/meteor/update.js
@@ -10,7 +10,7 @@ var ProgressBar = require('progress');
 var updater = require(path.join(__dirname, "..", "lib", "updater.js"));
 var files = require(path.join(__dirname, "..", "lib", "files.js"));
 
-var _ = require(path.join(__dirname, '..', 'lib', 'third', 'underscore.js'));
+var _ = require('underscore');
 
 // refuse to update if we're in a git checkout.
 if (files.in_checkout()) {
diff --git a/app/server/server.js b/app/server/server.js
index da9ccc80a5..78121555c5 100644
--- a/app/server/server.js
+++ b/app/server/server.js
@@ -12,9 +12,7 @@ var mime = require('mime');
 var handlebars = require('handlebars');
 var useragent = require('useragent');
 
-// this is a copy of underscore that will be shipped just for use by
-// this file, server.js.
-var _ = require(path.join(__dirname, 'underscore.js'));
+var _ = require('underscore');
 
 // This code is duplicated in app/server/server.js.
 var MIN_NODE_VERSION = 'v0.8.11';
diff --git a/app/server/underscore.js b/app/server/underscore.js
deleted file mode 100644
index 1ebe2671b9..0000000000
--- a/app/server/underscore.js
+++ /dev/null
@@ -1,1200 +0,0 @@
-//     Underscore.js 1.4.2
-//     http://underscorejs.org
-//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
-//     Underscore may be freely distributed under the MIT license.
-
-(function() {
-
-  // Baseline setup
-  // --------------
-
-  // Establish the root object, `window` in the browser, or `global` on the server.
-  var root = this;
-
-  // Save the previous value of the `_` variable.
-  var previousUnderscore = root._;
-
-  // Establish the object that gets returned to break out of a loop iteration.
-  var breaker = {};
-
-  // Save bytes in the minified (but not gzipped) version:
-  var ArrayProto = Array.prototype, ObjProto = Object.prototype, FuncProto = Function.prototype;
-
-  // Create quick reference variables for speed access to core prototypes.
-  var push             = ArrayProto.push,
-      slice            = ArrayProto.slice,
-      concat           = ArrayProto.concat,
-      unshift          = ArrayProto.unshift,
-      toString         = ObjProto.toString,
-      hasOwnProperty   = ObjProto.hasOwnProperty;
-
-  // All **ECMAScript 5** native function implementations that we hope to use
-  // are declared here.
-  var
-    nativeForEach      = ArrayProto.forEach,
-    nativeMap          = ArrayProto.map,
-    nativeReduce       = ArrayProto.reduce,
-    nativeReduceRight  = ArrayProto.reduceRight,
-    nativeFilter       = ArrayProto.filter,
-    nativeEvery        = ArrayProto.every,
-    nativeSome         = ArrayProto.some,
-    nativeIndexOf      = ArrayProto.indexOf,
-    nativeLastIndexOf  = ArrayProto.lastIndexOf,
-    nativeIsArray      = Array.isArray,
-    nativeKeys         = Object.keys,
-    nativeBind         = FuncProto.bind;
-
-  // Create a safe reference to the Underscore object for use below.
-  var _ = function(obj) {
-    if (obj instanceof _) return obj;
-    if (!(this instanceof _)) return new _(obj);
-    this._wrapped = obj;
-  };
-
-  // Export the Underscore object for **Node.js**, with
-  // backwards-compatibility for the old `require()` API. If we're in
-  // the browser, add `_` as a global object via a string identifier,
-  // for Closure Compiler "advanced" mode.
-  if (typeof exports !== 'undefined') {
-    if (typeof module !== 'undefined' && module.exports) {
-      exports = module.exports = _;
-    }
-    exports._ = _;
-  } else {
-    root['_'] = _;
-  }
-
-  // Current version.
-  _.VERSION = '1.4.2';
-
-  // Collection Functions
-  // --------------------
-
-  // The cornerstone, an `each` implementation, aka `forEach`.
-  // Handles objects with the built-in `forEach`, arrays, and raw objects.
-  // Delegates to **ECMAScript 5**'s native `forEach` if available.
-  var each = _.each = _.forEach = function(obj, iterator, context) {
-    if (obj == null) return;
-    if (nativeForEach && obj.forEach === nativeForEach) {
-      obj.forEach(iterator, context);
-    } else if (obj.length === +obj.length) {
-      for (var i = 0, l = obj.length; i < l; i++) {
-        if (iterator.call(context, obj[i], i, obj) === breaker) return;
-      }
-    } else {
-      for (var key in obj) {
-        if (_.has(obj, key)) {
-          if (iterator.call(context, obj[key], key, obj) === breaker) return;
-        }
-      }
-    }
-  };
-
-  // Return the results of applying the iterator to each element.
-  // Delegates to **ECMAScript 5**'s native `map` if available.
-  _.map = _.collect = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeMap && obj.map === nativeMap) return obj.map(iterator, context);
-    each(obj, function(value, index, list) {
-      results[results.length] = iterator.call(context, value, index, list);
-    });
-    return results;
-  };
-
-  // **Reduce** builds up a single result from a list of values, aka `inject`,
-  // or `foldl`. Delegates to **ECMAScript 5**'s native `reduce` if available.
-  _.reduce = _.foldl = _.inject = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduce && obj.reduce === nativeReduce) {
-      if (context) iterator = _.bind(iterator, context);
-      return initial ? obj.reduce(iterator, memo) : obj.reduce(iterator);
-    }
-    each(obj, function(value, index, list) {
-      if (!initial) {
-        memo = value;
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, value, index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // The right-associative version of reduce, also known as `foldr`.
-  // Delegates to **ECMAScript 5**'s native `reduceRight` if available.
-  _.reduceRight = _.foldr = function(obj, iterator, memo, context) {
-    var initial = arguments.length > 2;
-    if (obj == null) obj = [];
-    if (nativeReduceRight && obj.reduceRight === nativeReduceRight) {
-      if (context) iterator = _.bind(iterator, context);
-      return arguments.length > 2 ? obj.reduceRight(iterator, memo) : obj.reduceRight(iterator);
-    }
-    var length = obj.length;
-    if (length !== +length) {
-      var keys = _.keys(obj);
-      length = keys.length;
-    }
-    each(obj, function(value, index, list) {
-      index = keys ? keys[--length] : --length;
-      if (!initial) {
-        memo = obj[index];
-        initial = true;
-      } else {
-        memo = iterator.call(context, memo, obj[index], index, list);
-      }
-    });
-    if (!initial) throw new TypeError('Reduce of empty array with no initial value');
-    return memo;
-  };
-
-  // Return the first value which passes a truth test. Aliased as `detect`.
-  _.find = _.detect = function(obj, iterator, context) {
-    var result;
-    any(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) {
-        result = value;
-        return true;
-      }
-    });
-    return result;
-  };
-
-  // Return all the elements that pass a truth test.
-  // Delegates to **ECMAScript 5**'s native `filter` if available.
-  // Aliased as `select`.
-  _.filter = _.select = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    if (nativeFilter && obj.filter === nativeFilter) return obj.filter(iterator, context);
-    each(obj, function(value, index, list) {
-      if (iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Return all the elements for which a truth test fails.
-  _.reject = function(obj, iterator, context) {
-    var results = [];
-    if (obj == null) return results;
-    each(obj, function(value, index, list) {
-      if (!iterator.call(context, value, index, list)) results[results.length] = value;
-    });
-    return results;
-  };
-
-  // Determine whether all of the elements match a truth test.
-  // Delegates to **ECMAScript 5**'s native `every` if available.
-  // Aliased as `all`.
-  _.every = _.all = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = true;
-    if (obj == null) return result;
-    if (nativeEvery && obj.every === nativeEvery) return obj.every(iterator, context);
-    each(obj, function(value, index, list) {
-      if (!(result = result && iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if at least one element in the object matches a truth test.
-  // Delegates to **ECMAScript 5**'s native `some` if available.
-  // Aliased as `any`.
-  var any = _.some = _.any = function(obj, iterator, context) {
-    iterator || (iterator = _.identity);
-    var result = false;
-    if (obj == null) return result;
-    if (nativeSome && obj.some === nativeSome) return obj.some(iterator, context);
-    each(obj, function(value, index, list) {
-      if (result || (result = iterator.call(context, value, index, list))) return breaker;
-    });
-    return !!result;
-  };
-
-  // Determine if the array or object contains a given value (using `===`).
-  // Aliased as `include`.
-  _.contains = _.include = function(obj, target) {
-    var found = false;
-    if (obj == null) return found;
-    if (nativeIndexOf && obj.indexOf === nativeIndexOf) return obj.indexOf(target) != -1;
-    found = any(obj, function(value) {
-      return value === target;
-    });
-    return found;
-  };
-
-  // Invoke a method (with arguments) on every item in a collection.
-  _.invoke = function(obj, method) {
-    var args = slice.call(arguments, 2);
-    return _.map(obj, function(value) {
-      return (_.isFunction(method) ? method : value[method]).apply(value, args);
-    });
-  };
-
-  // Convenience version of a common use case of `map`: fetching a property.
-  _.pluck = function(obj, key) {
-    return _.map(obj, function(value){ return value[key]; });
-  };
-
-  // Convenience version of a common use case of `filter`: selecting only objects
-  // with specific `key:value` pairs.
-  _.where = function(obj, attrs) {
-    if (_.isEmpty(attrs)) return [];
-    return _.filter(obj, function(value) {
-      for (var key in attrs) {
-        if (attrs[key] !== value[key]) return false;
-      }
-      return true;
-    });
-  };
-
-  // Return the maximum element or (element-based computation).
-  // Can't optimize arrays of integers longer than 65,535 elements.
-  // See: https://bugs.webkit.org/show_bug.cgi?id=80797
-  _.max = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.max.apply(Math, obj);
-    }
-    if (!iterator && _.isEmpty(obj)) return -Infinity;
-    var result = {computed : -Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed >= result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Return the minimum element (or element-based computation).
-  _.min = function(obj, iterator, context) {
-    if (!iterator && _.isArray(obj) && obj[0] === +obj[0] && obj.length < 65535) {
-      return Math.min.apply(Math, obj);
-    }
-    if (!iterator && _.isEmpty(obj)) return Infinity;
-    var result = {computed : Infinity};
-    each(obj, function(value, index, list) {
-      var computed = iterator ? iterator.call(context, value, index, list) : value;
-      computed < result.computed && (result = {value : value, computed : computed});
-    });
-    return result.value;
-  };
-
-  // Shuffle an array.
-  _.shuffle = function(obj) {
-    var rand;
-    var index = 0;
-    var shuffled = [];
-    each(obj, function(value) {
-      rand = _.random(index++);
-      shuffled[index - 1] = shuffled[rand];
-      shuffled[rand] = value;
-    });
-    return shuffled;
-  };
-
-  // An internal function to generate lookup iterators.
-  var lookupIterator = function(value) {
-    return _.isFunction(value) ? value : function(obj){ return obj[value]; };
-  };
-
-  // Sort the object's values by a criterion produced by an iterator.
-  _.sortBy = function(obj, value, context) {
-    var iterator = lookupIterator(value);
-    return _.pluck(_.map(obj, function(value, index, list) {
-      return {
-        value : value,
-        index : index,
-        criteria : iterator.call(context, value, index, list)
-      };
-    }).sort(function(left, right) {
-      var a = left.criteria;
-      var b = right.criteria;
-      if (a !== b) {
-        if (a > b || a === void 0) return 1;
-        if (a < b || b === void 0) return -1;
-      }
-      return left.index < right.index ? -1 : 1;
-    }), 'value');
-  };
-
-  // An internal function used for aggregate "group by" operations.
-  var group = function(obj, value, context, behavior) {
-    var result = {};
-    var iterator = lookupIterator(value);
-    each(obj, function(value, index) {
-      var key = iterator.call(context, value, index, obj);
-      behavior(result, key, value);
-    });
-    return result;
-  };
-
-  // Groups the object's values by a criterion. Pass either a string attribute
-  // to group by, or a function that returns the criterion.
-  _.groupBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      (_.has(result, key) ? result[key] : (result[key] = [])).push(value);
-    });
-  };
-
-  // Counts instances of an object that group by a certain criterion. Pass
-  // either a string attribute to count by, or a function that returns the
-  // criterion.
-  _.countBy = function(obj, value, context) {
-    return group(obj, value, context, function(result, key, value) {
-      if (!_.has(result, key)) result[key] = 0;
-      result[key]++;
-    });
-  };
-
-  // Use a comparator function to figure out the smallest index at which
-  // an object should be inserted so as to maintain order. Uses binary search.
-  _.sortedIndex = function(array, obj, iterator, context) {
-    iterator = iterator == null ? _.identity : lookupIterator(iterator);
-    var value = iterator.call(context, obj);
-    var low = 0, high = array.length;
-    while (low < high) {
-      var mid = (low + high) >>> 1;
-      iterator.call(context, array[mid]) < value ? low = mid + 1 : high = mid;
-    }
-    return low;
-  };
-
-  // Safely convert anything iterable into a real, live array.
-  _.toArray = function(obj) {
-    if (!obj) return [];
-    if (obj.length === +obj.length) return slice.call(obj);
-    return _.values(obj);
-  };
-
-  // Return the number of elements in an object.
-  _.size = function(obj) {
-    return (obj.length === +obj.length) ? obj.length : _.keys(obj).length;
-  };
-
-  // Array Functions
-  // ---------------
-
-  // Get the first element of an array. Passing **n** will return the first N
-  // values in the array. Aliased as `head` and `take`. The **guard** check
-  // allows it to work with `_.map`.
-  _.first = _.head = _.take = function(array, n, guard) {
-    return (n != null) && !guard ? slice.call(array, 0, n) : array[0];
-  };
-
-  // Returns everything but the last entry of the array. Especially useful on
-  // the arguments object. Passing **n** will return all the values in
-  // the array, excluding the last N. The **guard** check allows it to work with
-  // `_.map`.
-  _.initial = function(array, n, guard) {
-    return slice.call(array, 0, array.length - ((n == null) || guard ? 1 : n));
-  };
-
-  // Get the last element of an array. Passing **n** will return the last N
-  // values in the array. The **guard** check allows it to work with `_.map`.
-  _.last = function(array, n, guard) {
-    if ((n != null) && !guard) {
-      return slice.call(array, Math.max(array.length - n, 0));
-    } else {
-      return array[array.length - 1];
-    }
-  };
-
-  // Returns everything but the first entry of the array. Aliased as `tail` and `drop`.
-  // Especially useful on the arguments object. Passing an **n** will return
-  // the rest N values in the array. The **guard**
-  // check allows it to work with `_.map`.
-  _.rest = _.tail = _.drop = function(array, n, guard) {
-    return slice.call(array, (n == null) || guard ? 1 : n);
-  };
-
-  // Trim out all falsy values from an array.
-  _.compact = function(array) {
-    return _.filter(array, function(value){ return !!value; });
-  };
-
-  // Internal implementation of a recursive `flatten` function.
-  var flatten = function(input, shallow, output) {
-    each(input, function(value) {
-      if (_.isArray(value)) {
-        shallow ? push.apply(output, value) : flatten(value, shallow, output);
-      } else {
-        output.push(value);
-      }
-    });
-    return output;
-  };
-
-  // Return a completely flattened version of an array.
-  _.flatten = function(array, shallow) {
-    return flatten(array, shallow, []);
-  };
-
-  // Return a version of the array that does not contain the specified value(s).
-  _.without = function(array) {
-    return _.difference(array, slice.call(arguments, 1));
-  };
-
-  // Produce a duplicate-free version of the array. If the array has already
-  // been sorted, you have the option of using a faster algorithm.
-  // Aliased as `unique`.
-  _.uniq = _.unique = function(array, isSorted, iterator, context) {
-    var initial = iterator ? _.map(array, iterator, context) : array;
-    var results = [];
-    var seen = [];
-    each(initial, function(value, index) {
-      if (isSorted ? (!index || seen[seen.length - 1] !== value) : !_.contains(seen, value)) {
-        seen.push(value);
-        results.push(array[index]);
-      }
-    });
-    return results;
-  };
-
-  // Produce an array that contains the union: each distinct element from all of
-  // the passed-in arrays.
-  _.union = function() {
-    return _.uniq(concat.apply(ArrayProto, arguments));
-  };
-
-  // Produce an array that contains every item shared between all the
-  // passed-in arrays.
-  _.intersection = function(array) {
-    var rest = slice.call(arguments, 1);
-    return _.filter(_.uniq(array), function(item) {
-      return _.every(rest, function(other) {
-        return _.indexOf(other, item) >= 0;
-      });
-    });
-  };
-
-  // Take the difference between one array and a number of other arrays.
-  // Only the elements present in just the first array will remain.
-  _.difference = function(array) {
-    var rest = concat.apply(ArrayProto, slice.call(arguments, 1));
-    return _.filter(array, function(value){ return !_.contains(rest, value); });
-  };
-
-  // Zip together multiple lists into a single array -- elements that share
-  // an index go together.
-  _.zip = function() {
-    var args = slice.call(arguments);
-    var length = _.max(_.pluck(args, 'length'));
-    var results = new Array(length);
-    for (var i = 0; i < length; i++) {
-      results[i] = _.pluck(args, "" + i);
-    }
-    return results;
-  };
-
-  // Converts lists into objects. Pass either a single array of `[key, value]`
-  // pairs, or two parallel arrays of the same length -- one of keys, and one of
-  // the corresponding values.
-  _.object = function(list, values) {
-    var result = {};
-    for (var i = 0, l = list.length; i < l; i++) {
-      if (values) {
-        result[list[i]] = values[i];
-      } else {
-        result[list[i][0]] = list[i][1];
-      }
-    }
-    return result;
-  };
-
-  // If the browser doesn't supply us with indexOf (I'm looking at you, **MSIE**),
-  // we need this function. Return the position of the first occurrence of an
-  // item in an array, or -1 if the item is not included in the array.
-  // Delegates to **ECMAScript 5**'s native `indexOf` if available.
-  // If the array is large and already in sort order, pass `true`
-  // for **isSorted** to use binary search.
-  _.indexOf = function(array, item, isSorted) {
-    if (array == null) return -1;
-    var i = 0, l = array.length;
-    if (isSorted) {
-      if (typeof isSorted == 'number') {
-        i = (isSorted < 0 ? Math.max(0, l + isSorted) : isSorted);
-      } else {
-        i = _.sortedIndex(array, item);
-        return array[i] === item ? i : -1;
-      }
-    }
-    if (nativeIndexOf && array.indexOf === nativeIndexOf) return array.indexOf(item, isSorted);
-    for (; i < l; i++) if (array[i] === item) return i;
-    return -1;
-  };
-
-  // Delegates to **ECMAScript 5**'s native `lastIndexOf` if available.
-  _.lastIndexOf = function(array, item, from) {
-    if (array == null) return -1;
-    var hasIndex = from != null;
-    if (nativeLastIndexOf && array.lastIndexOf === nativeLastIndexOf) {
-      return hasIndex ? array.lastIndexOf(item, from) : array.lastIndexOf(item);
-    }
-    var i = (hasIndex ? from : array.length);
-    while (i--) if (array[i] === item) return i;
-    return -1;
-  };
-
-  // Generate an integer Array containing an arithmetic progression. A port of
-  // the native Python `range()` function. See
-  // [the Python documentation](http://docs.python.org/library/functions.html#range).
-  _.range = function(start, stop, step) {
-    if (arguments.length <= 1) {
-      stop = start || 0;
-      start = 0;
-    }
-    step = arguments[2] || 1;
-
-    var len = Math.max(Math.ceil((stop - start) / step), 0);
-    var idx = 0;
-    var range = new Array(len);
-
-    while(idx < len) {
-      range[idx++] = start;
-      start += step;
-    }
-
-    return range;
-  };
-
-  // Function (ahem) Functions
-  // ------------------
-
-  // Reusable constructor function for prototype setting.
-  var ctor = function(){};
-
-  // Create a function bound to a given object (assigning `this`, and arguments,
-  // optionally). Binding with arguments is also known as `curry`.
-  // Delegates to **ECMAScript 5**'s native `Function.bind` if available.
-  // We check for `func.bind` first, to fail fast when `func` is undefined.
-  _.bind = function bind(func, context) {
-    var bound, args;
-    if (func.bind === nativeBind && nativeBind) return nativeBind.apply(func, slice.call(arguments, 1));
-    if (!_.isFunction(func)) throw new TypeError;
-    args = slice.call(arguments, 2);
-    return bound = function() {
-      if (!(this instanceof bound)) return func.apply(context, args.concat(slice.call(arguments)));
-      ctor.prototype = func.prototype;
-      var self = new ctor;
-      var result = func.apply(self, args.concat(slice.call(arguments)));
-      if (Object(result) === result) return result;
-      return self;
-    };
-  };
-
-  // Bind all of an object's methods to that object. Useful for ensuring that
-  // all callbacks defined on an object belong to it.
-  _.bindAll = function(obj) {
-    var funcs = slice.call(arguments, 1);
-    if (funcs.length == 0) funcs = _.functions(obj);
-    each(funcs, function(f) { obj[f] = _.bind(obj[f], obj); });
-    return obj;
-  };
-
-  // Memoize an expensive function by storing its results.
-  _.memoize = function(func, hasher) {
-    var memo = {};
-    hasher || (hasher = _.identity);
-    return function() {
-      var key = hasher.apply(this, arguments);
-      return _.has(memo, key) ? memo[key] : (memo[key] = func.apply(this, arguments));
-    };
-  };
-
-  // Delays a function for the given number of milliseconds, and then calls
-  // it with the arguments supplied.
-  _.delay = function(func, wait) {
-    var args = slice.call(arguments, 2);
-    return setTimeout(function(){ return func.apply(null, args); }, wait);
-  };
-
-  // Defers a function, scheduling it to run after the current call stack has
-  // cleared.
-  _.defer = function(func) {
-    return _.delay.apply(_, [func, 1].concat(slice.call(arguments, 1)));
-  };
-
-  // Returns a function, that, when invoked, will only be triggered at most once
-  // during a given window of time.
-  _.throttle = function(func, wait) {
-    var context, args, timeout, throttling, more, result;
-    var whenDone = _.debounce(function(){ more = throttling = false; }, wait);
-    return function() {
-      context = this; args = arguments;
-      var later = function() {
-        timeout = null;
-        if (more) {
-          result = func.apply(context, args);
-        }
-        whenDone();
-      };
-      if (!timeout) timeout = setTimeout(later, wait);
-      if (throttling) {
-        more = true;
-      } else {
-        throttling = true;
-        result = func.apply(context, args);
-      }
-      whenDone();
-      return result;
-    };
-  };
-
-  // Returns a function, that, as long as it continues to be invoked, will not
-  // be triggered. The function will be called after it stops being called for
-  // N milliseconds. If `immediate` is passed, trigger the function on the
-  // leading edge, instead of the trailing.
-  _.debounce = function(func, wait, immediate) {
-    var timeout, result;
-    return function() {
-      var context = this, args = arguments;
-      var later = function() {
-        timeout = null;
-        if (!immediate) result = func.apply(context, args);
-      };
-      var callNow = immediate && !timeout;
-      clearTimeout(timeout);
-      timeout = setTimeout(later, wait);
-      if (callNow) result = func.apply(context, args);
-      return result;
-    };
-  };
-
-  // Returns a function that will be executed at most one time, no matter how
-  // often you call it. Useful for lazy initialization.
-  _.once = function(func) {
-    var ran = false, memo;
-    return function() {
-      if (ran) return memo;
-      ran = true;
-      memo = func.apply(this, arguments);
-      func = null;
-      return memo;
-    };
-  };
-
-  // Returns the first function passed as an argument to the second,
-  // allowing you to adjust arguments, run code before and after, and
-  // conditionally execute the original function.
-  _.wrap = function(func, wrapper) {
-    return function() {
-      var args = [func];
-      push.apply(args, arguments);
-      return wrapper.apply(this, args);
-    };
-  };
-
-  // Returns a function that is the composition of a list of functions, each
-  // consuming the return value of the function that follows.
-  _.compose = function() {
-    var funcs = arguments;
-    return function() {
-      var args = arguments;
-      for (var i = funcs.length - 1; i >= 0; i--) {
-        args = [funcs[i].apply(this, args)];
-      }
-      return args[0];
-    };
-  };
-
-  // Returns a function that will only be executed after being called N times.
-  _.after = function(times, func) {
-    if (times <= 0) return func();
-    return function() {
-      if (--times < 1) {
-        return func.apply(this, arguments);
-      }
-    };
-  };
-
-  // Object Functions
-  // ----------------
-
-  // Retrieve the names of an object's properties.
-  // Delegates to **ECMAScript 5**'s native `Object.keys`
-  _.keys = nativeKeys || function(obj) {
-    if (obj !== Object(obj)) throw new TypeError('Invalid object');
-    var keys = [];
-    for (var key in obj) if (_.has(obj, key)) keys[keys.length] = key;
-    return keys;
-  };
-
-  // Retrieve the values of an object's properties.
-  _.values = function(obj) {
-    var values = [];
-    for (var key in obj) if (_.has(obj, key)) values.push(obj[key]);
-    return values;
-  };
-
-  // Convert an object into a list of `[key, value]` pairs.
-  _.pairs = function(obj) {
-    var pairs = [];
-    for (var key in obj) if (_.has(obj, key)) pairs.push([key, obj[key]]);
-    return pairs;
-  };
-
-  // Invert the keys and values of an object. The values must be serializable.
-  _.invert = function(obj) {
-    var result = {};
-    for (var key in obj) if (_.has(obj, key)) result[obj[key]] = key;
-    return result;
-  };
-
-  // Return a sorted list of the function names available on the object.
-  // Aliased as `methods`
-  _.functions = _.methods = function(obj) {
-    var names = [];
-    for (var key in obj) {
-      if (_.isFunction(obj[key])) names.push(key);
-    }
-    return names.sort();
-  };
-
-  // Extend a given object with all the properties in passed-in object(s).
-  _.extend = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Return a copy of the object only containing the whitelisted properties.
-  _.pick = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    each(keys, function(key) {
-      if (key in obj) copy[key] = obj[key];
-    });
-    return copy;
-  };
-
-   // Return a copy of the object without the blacklisted properties.
-  _.omit = function(obj) {
-    var copy = {};
-    var keys = concat.apply(ArrayProto, slice.call(arguments, 1));
-    for (var key in obj) {
-      if (!_.contains(keys, key)) copy[key] = obj[key];
-    }
-    return copy;
-  };
-
-  // Fill in a given object with default properties.
-  _.defaults = function(obj) {
-    each(slice.call(arguments, 1), function(source) {
-      for (var prop in source) {
-        if (obj[prop] == null) obj[prop] = source[prop];
-      }
-    });
-    return obj;
-  };
-
-  // Create a (shallow-cloned) duplicate of an object.
-  _.clone = function(obj) {
-    if (!_.isObject(obj)) return obj;
-    return _.isArray(obj) ? obj.slice() : _.extend({}, obj);
-  };
-
-  // Invokes interceptor with the obj, and then returns obj.
-  // The primary purpose of this method is to "tap into" a method chain, in
-  // order to perform operations on intermediate results within the chain.
-  _.tap = function(obj, interceptor) {
-    interceptor(obj);
-    return obj;
-  };
-
-  // Internal recursive comparison function for `isEqual`.
-  var eq = function(a, b, aStack, bStack) {
-    // Identical objects are equal. `0 === -0`, but they aren't identical.
-    // See the Harmony `egal` proposal: http://wiki.ecmascript.org/doku.php?id=harmony:egal.
-    if (a === b) return a !== 0 || 1 / a == 1 / b;
-    // A strict comparison is necessary because `null == undefined`.
-    if (a == null || b == null) return a === b;
-    // Unwrap any wrapped objects.
-    if (a instanceof _) a = a._wrapped;
-    if (b instanceof _) b = b._wrapped;
-    // Compare `[[Class]]` names.
-    var className = toString.call(a);
-    if (className != toString.call(b)) return false;
-    switch (className) {
-      // Strings, numbers, dates, and booleans are compared by value.
-      case '[object String]':
-        // Primitives and their corresponding object wrappers are equivalent; thus, `"5"` is
-        // equivalent to `new String("5")`.
-        return a == String(b);
-      case '[object Number]':
-        // `NaN`s are equivalent, but non-reflexive. An `egal` comparison is performed for
-        // other numeric values.
-        return a != +a ? b != +b : (a == 0 ? 1 / a == 1 / b : a == +b);
-      case '[object Date]':
-      case '[object Boolean]':
-        // Coerce dates and booleans to numeric primitive values. Dates are compared by their
-        // millisecond representations. Note that invalid dates with millisecond representations
-        // of `NaN` are not equivalent.
-        return +a == +b;
-      // RegExps are compared by their source patterns and flags.
-      case '[object RegExp]':
-        return a.source == b.source &&
-               a.global == b.global &&
-               a.multiline == b.multiline &&
-               a.ignoreCase == b.ignoreCase;
-    }
-    if (typeof a != 'object' || typeof b != 'object') return false;
-    // Assume equality for cyclic structures. The algorithm for detecting cyclic
-    // structures is adapted from ES 5.1 section 15.12.3, abstract operation `JO`.
-    var length = aStack.length;
-    while (length--) {
-      // Linear search. Performance is inversely proportional to the number of
-      // unique nested structures.
-      if (aStack[length] == a) return bStack[length] == b;
-    }
-    // Add the first object to the stack of traversed objects.
-    aStack.push(a);
-    bStack.push(b);
-    var size = 0, result = true;
-    // Recursively compare objects and arrays.
-    if (className == '[object Array]') {
-      // Compare array lengths to determine if a deep comparison is necessary.
-      size = a.length;
-      result = size == b.length;
-      if (result) {
-        // Deep compare the contents, ignoring non-numeric properties.
-        while (size--) {
-          if (!(result = eq(a[size], b[size], aStack, bStack))) break;
-        }
-      }
-    } else {
-      // Objects with different constructors are not equivalent, but `Object`s
-      // from different frames are.
-      var aCtor = a.constructor, bCtor = b.constructor;
-      if (aCtor !== bCtor && !(_.isFunction(aCtor) && (aCtor instanceof aCtor) &&
-                               _.isFunction(bCtor) && (bCtor instanceof bCtor))) {
-        return false;
-      }
-      // Deep compare objects.
-      for (var key in a) {
-        if (_.has(a, key)) {
-          // Count the expected number of properties.
-          size++;
-          // Deep compare each member.
-          if (!(result = _.has(b, key) && eq(a[key], b[key], aStack, bStack))) break;
-        }
-      }
-      // Ensure that both objects contain the same number of properties.
-      if (result) {
-        for (key in b) {
-          if (_.has(b, key) && !(size--)) break;
-        }
-        result = !size;
-      }
-    }
-    // Remove the first object from the stack of traversed objects.
-    aStack.pop();
-    bStack.pop();
-    return result;
-  };
-
-  // Perform a deep comparison to check if two objects are equal.
-  _.isEqual = function(a, b) {
-    return eq(a, b, [], []);
-  };
-
-  // Is a given array, string, or object empty?
-  // An "empty" object has no enumerable own-properties.
-  _.isEmpty = function(obj) {
-    if (obj == null) return true;
-    if (_.isArray(obj) || _.isString(obj)) return obj.length === 0;
-    for (var key in obj) if (_.has(obj, key)) return false;
-    return true;
-  };
-
-  // Is a given value a DOM element?
-  _.isElement = function(obj) {
-    return !!(obj && obj.nodeType === 1);
-  };
-
-  // Is a given value an array?
-  // Delegates to ECMA5's native Array.isArray
-  _.isArray = nativeIsArray || function(obj) {
-    return toString.call(obj) == '[object Array]';
-  };
-
-  // Is a given variable an object?
-  _.isObject = function(obj) {
-    return obj === Object(obj);
-  };
-
-  // Add some isType methods: isArguments, isFunction, isString, isNumber, isDate, isRegExp.
-  each(['Arguments', 'Function', 'String', 'Number', 'Date', 'RegExp'], function(name) {
-    _['is' + name] = function(obj) {
-      return toString.call(obj) == '[object ' + name + ']';
-    };
-  });
-
-  // Define a fallback version of the method in browsers (ahem, IE), where
-  // there isn't any inspectable "Arguments" type.
-  if (!_.isArguments(arguments)) {
-    _.isArguments = function(obj) {
-      return !!(obj && _.has(obj, 'callee'));
-    };
-  }
-
-  // Optimize `isFunction` if appropriate.
-  if (typeof (/./) !== 'function') {
-    _.isFunction = function(obj) {
-      return typeof obj === 'function';
-    };
-  }
-
-  // Is a given object a finite number?
-  _.isFinite = function(obj) {
-    return _.isNumber(obj) && isFinite(obj);
-  };
-
-  // Is the given value `NaN`? (NaN is the only number which does not equal itself).
-  _.isNaN = function(obj) {
-    return _.isNumber(obj) && obj != +obj;
-  };
-
-  // Is a given value a boolean?
-  _.isBoolean = function(obj) {
-    return obj === true || obj === false || toString.call(obj) == '[object Boolean]';
-  };
-
-  // Is a given value equal to null?
-  _.isNull = function(obj) {
-    return obj === null;
-  };
-
-  // Is a given variable undefined?
-  _.isUndefined = function(obj) {
-    return obj === void 0;
-  };
-
-  // Shortcut function for checking if an object has a given property directly
-  // on itself (in other words, not on a prototype).
-  _.has = function(obj, key) {
-    return hasOwnProperty.call(obj, key);
-  };
-
-  // Utility Functions
-  // -----------------
-
-  // Run Underscore.js in *noConflict* mode, returning the `_` variable to its
-  // previous owner. Returns a reference to the Underscore object.
-  _.noConflict = function() {
-    root._ = previousUnderscore;
-    return this;
-  };
-
-  // Keep the identity function around for default iterators.
-  _.identity = function(value) {
-    return value;
-  };
-
-  // Run a function **n** times.
-  _.times = function(n, iterator, context) {
-    for (var i = 0; i < n; i++) iterator.call(context, i);
-  };
-
-  // Return a random integer between min and max (inclusive).
-  _.random = function(min, max) {
-    if (max == null) {
-      max = min;
-      min = 0;
-    }
-    return min + (0 | Math.random() * (max - min + 1));
-  };
-
-  // List of HTML entities for escaping.
-  var entityMap = {
-    escape: {
-      '&': '&amp;',
-      '<': '&lt;',
-      '>': '&gt;',
-      '"': '&quot;',
-      "'": '&#x27;',
-      '/': '&#x2F;'
-    }
-  };
-  entityMap.unescape = _.invert(entityMap.escape);
-
-  // Regexes containing the keys and values listed immediately above.
-  var entityRegexes = {
-    escape:   new RegExp('[' + _.keys(entityMap.escape).join('') + ']', 'g'),
-    unescape: new RegExp('(' + _.keys(entityMap.unescape).join('|') + ')', 'g')
-  };
-
-  // Functions for escaping and unescaping strings to/from HTML interpolation.
-  _.each(['escape', 'unescape'], function(method) {
-    _[method] = function(string) {
-      if (string == null) return '';
-      return ('' + string).replace(entityRegexes[method], function(match) {
-        return entityMap[method][match];
-      });
-    };
-  });
-
-  // If the value of the named property is a function then invoke it;
-  // otherwise, return it.
-  _.result = function(object, property) {
-    if (object == null) return null;
-    var value = object[property];
-    return _.isFunction(value) ? value.call(object) : value;
-  };
-
-  // Add your own custom functions to the Underscore object.
-  _.mixin = function(obj) {
-    each(_.functions(obj), function(name){
-      var func = _[name] = obj[name];
-      _.prototype[name] = function() {
-        var args = [this._wrapped];
-        push.apply(args, arguments);
-        return result.call(this, func.apply(_, args));
-      };
-    });
-  };
-
-  // Generate a unique integer id (unique within the entire client session).
-  // Useful for temporary DOM ids.
-  var idCounter = 0;
-  _.uniqueId = function(prefix) {
-    var id = idCounter++;
-    return prefix ? prefix + id : id;
-  };
-
-  // By default, Underscore uses ERB-style template delimiters, change the
-  // following template settings to use alternative delimiters.
-  _.templateSettings = {
-    evaluate    : /<%([\s\S]+?)%>/g,
-    interpolate : /<%=([\s\S]+?)%>/g,
-    escape      : /<%-([\s\S]+?)%>/g
-  };
-
-  // When customizing `templateSettings`, if you don't want to define an
-  // interpolation, evaluation or escaping regex, we need one that is
-  // guaranteed not to match.
-  var noMatch = /(.)^/;
-
-  // Certain characters need to be escaped so that they can be put into a
-  // string literal.
-  var escapes = {
-    "'":      "'",
-    '\\':     '\\',
-    '\r':     'r',
-    '\n':     'n',
-    '\t':     't',
-    '\u2028': 'u2028',
-    '\u2029': 'u2029'
-  };
-
-  var escaper = /\\|'|\r|\n|\t|\u2028|\u2029/g;
-
-  // JavaScript micro-templating, similar to John Resig's implementation.
-  // Underscore templating handles arbitrary delimiters, preserves whitespace,
-  // and correctly escapes quotes within interpolated code.
-  _.template = function(text, data, settings) {
-    settings = _.defaults({}, settings, _.templateSettings);
-
-    // Combine delimiters into one regular expression via alternation.
-    var matcher = new RegExp([
-      (settings.escape || noMatch).source,
-      (settings.interpolate || noMatch).source,
-      (settings.evaluate || noMatch).source
-    ].join('|') + '|$', 'g');
-
-    // Compile the template source, escaping string literals appropriately.
-    var index = 0;
-    var source = "__p+='";
-    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
-      source += text.slice(index, offset)
-        .replace(escaper, function(match) { return '\\' + escapes[match]; });
-      source +=
-        escape ? "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'" :
-        interpolate ? "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'" :
-        evaluate ? "';\n" + evaluate + "\n__p+='" : '';
-      index = offset + match.length;
-    });
-    source += "';\n";
-
-    // If a variable is not specified, place data values in local scope.
-    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
-
-    source = "var __t,__p='',__j=Array.prototype.join," +
-      "print=function(){__p+=__j.call(arguments,'');};\n" +
-      source + "return __p;\n";
-
-    try {
-      var render = new Function(settings.variable || 'obj', '_', source);
-    } catch (e) {
-      e.source = source;
-      throw e;
-    }
-
-    if (data) return render(data, _);
-    var template = function(data) {
-      return render.call(this, data, _);
-    };
-
-    // Provide the compiled function source as a convenience for precompilation.
-    template.source = 'function(' + (settings.variable || 'obj') + '){\n' + source + '}';
-
-    return template;
-  };
-
-  // Add a "chain" function, which will delegate to the wrapper.
-  _.chain = function(obj) {
-    return _(obj).chain();
-  };
-
-  // OOP
-  // ---------------
-  // If Underscore is called as a function, it returns a wrapped object that
-  // can be used OO-style. This wrapper holds altered versions of all the
-  // underscore functions. Wrapped objects may be chained.
-
-  // Helper function to continue chaining intermediate results.
-  var result = function(obj) {
-    return this._chain ? _(obj).chain() : obj;
-  };
-
-  // Add all of the Underscore functions to the wrapper object.
-  _.mixin(_);
-
-  // Add all mutator Array functions to the wrapper.
-  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      var obj = this._wrapped;
-      method.apply(obj, arguments);
-      if ((name == 'shift' || name == 'splice') && obj.length === 0) delete obj[0];
-      return result.call(this, obj);
-    };
-  });
-
-  // Add all accessor Array functions to the wrapper.
-  each(['concat', 'join', 'slice'], function(name) {
-    var method = ArrayProto[name];
-    _.prototype[name] = function() {
-      return result.call(this, method.apply(this._wrapped, arguments));
-    };
-  });
-
-  _.extend(_.prototype, {
-
-    // Start chaining a wrapped Underscore object.
-    chain: function() {
-      this._chain = true;
-      return this;
-    },
-
-    // Extracts the result from a wrapped and chained object.
-    value: function() {
-      return this._wrapped;
-    }
-
-  });
-
-}).call(this);
diff --git a/docs/client/api.html b/docs/client/api.html
index 8508da1208..33c0455324 100644
--- a/docs/client/api.html
+++ b/docs/client/api.html
@@ -30,6 +30,8 @@ put on the screen.
 
 {{> api_box absoluteUrl}}
 
+{{> api_box settings}}
+
 <h2 id="publishandsubscribe"><span>Publish and subscribe</span></h2>
 
 These functions control how Meteor servers publish sets of records and
@@ -526,11 +528,9 @@ In this release, Minimongo has some limitations:
 * `$elemMatch` is not supported in selectors.
 * `$pull` in modifiers can only accept certain kinds
 of selectors.
-* In selectors, dot notation and ordinal indexing may not work correctly.
+* In selectors, dot notation may not work correctly.
 * `$` to denote the matched array position is not
 supported in modifier.
-* Sort does not support subkeys (you can sort on `a`,
-but not `a.b`).
 * `findAndModify`, upsert, aggregate functions, and
 map/reduce aren't supported.
 * The supported types are String, Number, Boolean, Array,
@@ -1031,8 +1031,8 @@ it's up to you to be sure.
 {{#api_box_inline fieldspecifiers}}
 
 On the server, queries can specify a particular set of fields to include
-or exclude from the result object.  Minimongo ignores the field
-specifier.
+or exclude from the result object.  (The field specifier is currently
+ignored on the client.)
 
 To exclude certain fields from the result objects, the field specifier
 is a dictionary whose keys are field names and whose values are `0`.
@@ -1337,6 +1337,9 @@ Example:
         facebook: ['user_likes'],
         github: ['user', 'repo']
       },
+      requestOfflineToken: {
+        google: true
+      },
       passwordSignupFields: 'USERNAME_AND_OPTIONAL_EMAIL'
     });
 
@@ -2449,6 +2452,35 @@ If `MAIL_URL` is not set (eg, when running your application locally),
 You must provide the `from` option and at least one of `to`, `cc`, and `bcc`;
 all other options are optional.
 
+`Email.send` only works on the server. Here is an example of how a
+client could use a server method call to send an email. (In an actual
+application, you'd need to be careful to limit the emails that a
+client could send, to prevent your server from being used as a relay
+by spammers.)
+
+    // In your server code: define a method that the client can call
+    Meteor.methods({
+      sendEmail: function (to, from, subject, text) {
+        // Let other method calls from the same client start running,
+        // without waiting for the email sending to complete.
+        this.unblock();
+
+        Email.send({
+          to: to,
+          from: from,
+          subject: subject,
+          text: text
+        });
+      }
+    });
+
+    // In your client code: asynchronously send an email
+    Meteor.call('sendEmail',
+                'alice@example.com',
+                'bob@example.com',
+                'Hello from Meteor!',
+                'This is a test of Email.send.');
+
 {{/better_markdown}}
 </template>
 
diff --git a/docs/client/api.js b/docs/client/api.js
index c2217e1c60..2b4d85c4fb 100644
--- a/docs/client/api.js
+++ b/docs/client/api.js
@@ -54,6 +54,17 @@ Template.api.absoluteUrl = {
   ]
 };
 
+Template.api.settings = {
+  id: "meteor_settings",
+  name: "Meteor.settings",
+  locus: "Server",
+  descr: ["`Meteor.settings` contains any deployment-specific options that were " +
+          "provided using the `--settings` option for `meteor run` or `meteor deploy`. " +
+          "If you provide the `--settings` option, `Meteor.settings` will be the " +
+          "JSON object in the file you specify.  Otherwise, `Meteor.settings` will " +
+          "be an empty object."]
+};
+
 Template.api.publish = {
   id: "meteor_publish",
   name: "Meteor.publish(name, func)",
@@ -363,10 +374,10 @@ Template.api.find = {
     {name: "fields",
      type: "Object: field specifier",
      type_link: "fieldspecifiers",
-     descr: "Dictionary of fields to return or exclude."},
+     descr: "(Server only) Dictionary of fields to return or exclude."},
     {name: "reactive",
      type: "Boolean",
-     descr: "Default `true`; pass `false` to disable reactivity"}
+     descr: "(Client only) Default `true`; pass `false` to disable reactivity"}
   ]
 };
 
@@ -392,10 +403,10 @@ Template.api.findone = {
     {name: "fields",
      type: "Object: field specifier",
      type_link: "fieldspecifiers",
-     descr: "Dictionary of fields to return or exclude."},
+     descr: "(Server only) Dictionary of fields to return or exclude."},
     {name: "reactive",
      type: "Boolean",
-     descr: "Default true; pass false to disable reactivity"}
+     descr: "(Client only) Default true; pass false to disable reactivity"}
   ]
 };
 
@@ -791,6 +802,11 @@ Template.api.loginWithExternalService = {
       name: "requestPermissions",
       type: "Array of Strings",
       descr: "A list of permissions to request from the user."
+    },
+    {
+      name: "requestOfflineToken",
+      type: "Boolean",
+      descr: "If true, asks the user for permission to act on their behalf when offline. This stores an additional offline token in the `services` field of the user document. Currently only supported with Google."
     }
   ]
 };
@@ -827,6 +843,11 @@ Template.api.accounts_ui_config = {
       type: "Object",
       descr: "Which [permissions](#requestpermissions) to request from the user for each external service."
     },
+    {
+      name: "requestOfflineToken",
+      type: "Object",
+      descr: "To ask the user for permission to act on their behalf when offline, map the relevant external service to `true`. Currently only supported with Google. See [Meteor.loginWithExternalService](#meteor_loginwithexternalservice) for more details."
+    },
     {
       name: "passwordSignupFields",
       type: "String",
diff --git a/docs/client/commandline.html b/docs/client/commandline.html
index 7ed2643e89..619e3f0472 100644
--- a/docs/client/commandline.html
+++ b/docs/client/commandline.html
@@ -29,6 +29,9 @@ required.
 This is the default command. Simply running `meteor` is the
 same as `meteor run`.
 
+To pass additional options to Node.js use the `NODE_OPTIONS` environment variable.
+For example: `NODE_OPTIONS='--debug'` or `NODE_OPTIONS='--debug-brk'`
+
 Run `meteor help run` to see the full list of options.
 
 
@@ -90,6 +93,17 @@ domain like myapp.com, you'll need a DNS A record, matching the IP
 address of origin.meteor.com.
 {{/warning}}
 
+
+
+You can add information specific to a particular deployment of your application
+by using the `--settings` option.  The argument to `--settings` is a file
+containing any JSON string.  The object in your settings file will appear on the
+server side of your application in [`Meteor.settings`](#meteor_settings).
+
+Settings are persistent.  When you redeploy your app, the old value will be
+preserved unless you explicitly pass new settings using the `--settings` option.
+To unset `Meteor.settings`, pass an empty settings file.
+
 <h3 id="meteorlogs">meteor logs <i>site</i></h3>
 
 Retrieves the server logs for the named Meteor application.
diff --git a/docs/client/docs.css b/docs/client/docs.css
index 4f98beac79..b4c72506e2 100644
--- a/docs/client/docs.css
+++ b/docs/client/docs.css
@@ -43,6 +43,7 @@ pre {
 code {
     font-family: monospace;
     font-size: 1.1em;
+    white-space: pre;
 }
 
 ul {
diff --git a/docs/client/docs.html b/docs/client/docs.html
index d03097a480..e4c114fff2 100644
--- a/docs/client/docs.html
+++ b/docs/client/docs.html
@@ -11,7 +11,7 @@
   </div>
   <div id="main">
     <div id="top"></div>
-    <h1 class="main-headline">Meteor 0.5.2</h1>
+    <h1 class="main-headline">Meteor 0.5.3</h1>
     {{> introduction }}
     {{> concepts }}
     {{> api }}
diff --git a/docs/client/docs.js b/docs/client/docs.js
index e01f20a1d8..a32fbac4d7 100644
--- a/docs/client/docs.js
+++ b/docs/client/docs.js
@@ -1,4 +1,4 @@
-METEOR_VERSION = "0.5.2";
+METEOR_VERSION = "0.5.3";
 
 Meteor.startup(function () {
   // XXX this is broken by the new multi-page layout.  Also, it was
@@ -94,7 +94,8 @@ var toc = [
       "Meteor.isClient",
       "Meteor.isServer",
       "Meteor.startup",
-      "Meteor.absoluteUrl"
+      "Meteor.absoluteUrl",
+      "Meteor.settings"
     ],
 
     "Publish and subscribe", [
diff --git a/examples/parties/client/parties.css b/examples/parties/client/parties.css
index 19b3cb58ef..e51bfc6fb5 100644
--- a/examples/parties/client/parties.css
+++ b/examples/parties/client/parties.css
@@ -44,7 +44,7 @@ input.chosen {
 
 .map {
     position: relative;
-    background-image: url('/soma.jpeg');
+    background-image: url('/soma.png');
     background-position: -20px -20px;
     width: 500px;
     height: 500px;
diff --git a/examples/parties/public/soma.jpeg b/examples/parties/public/soma.png
similarity index 100%
rename from examples/parties/public/soma.jpeg
rename to examples/parties/public/soma.png
diff --git a/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html b/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
index 1470af65b9..87d4b8a881 100644
--- a/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
+++ b/examples/unfinished/accounts-ui-viewer/accounts-ui-viewer.html
@@ -7,7 +7,7 @@
 </body>
 
 <template name="radio">
-  <span class="radio"><input id="{{key}}:{{value}}" {{maybeChecked}} type="radio" name="{{key}}" value="{{value}}" />{{! no whitespace}}<label for="{{key}}:{{value}}">{{label}}</label></span>
+  <span class="radio"><input id="{{key}}:{{value}}" {{{maybeChecked}}} type="radio" name="{{key}}" value="{{value}}" />{{! no whitespace}}<label for="{{key}}:{{value}}">{{label}}</label></span>
 </template>
 
 <template name="button">
diff --git a/examples/unfinished/benchmark/benchmark-scenarios.js b/examples/unfinished/benchmark/benchmark-scenarios.js
deleted file mode 100644
index ffcbad6e3e..0000000000
--- a/examples/unfinished/benchmark/benchmark-scenarios.js
+++ /dev/null
@@ -1,58 +0,0 @@
-// Parameters for simulation:
-//
-// Each document is randomly placed in a collection, with a random
-// 'bucket' field. Clients sub to 1 bucket in each collection.
-//
-// - numCollections
-//     how many collections to spread the documents over
-// - numBuckets
-//     number of buckets per collection.
-//
-// - initialDocuments: Inital documents added by the server. Probably
-//     not usefully combined with maxAgeSeconds
-//
-// - maxAgeSeconds: How long to leave documents in the database. This,
-//     combined with all the various rates, determines the steady state
-//     database size. In seconds. falsy to disable.
-//
-// Per-client action rates:
-// - insertsPerSecond
-// - updatesPerSecond
-// - removesPerSecond
-//
-// - documentSize: bytes of randomness per document.
-//     // XXX make this a random distribution?
-// - documentNumFields: how many fields of randomness per document.
-//
-// XXX also max documents? (count and remove N)
-
-SCENARIOS = {
-
-  default: {
-    numCollections: 1,
-    numBuckets: 3,
-    initialDocuments: 1,
-    maxAgeSeconds: 60,
-    insertsPerSecond: 1,
-    updatesPerSecond: 1,
-    removesPerSecond: 0.1,
-    documentSize: 1024,
-    documentNumFields: 8
-  },
-
-  nodata: {
-    numCollections: 1,
-    numBuckets: 1,
-    initialDocuments: 0
-  },
-
-  bigdata: {
-    numCollections: 1,
-    numBuckets: 1,
-    initialDocuments: 1024,
-    updatesPerSecond: 1,
-    documentSize: 10240,
-    documentNumFields: 16
-  }
-
-};
diff --git a/examples/unfinished/benchmark/benchmark.js b/examples/unfinished/benchmark/benchmark.js
index 20a087785b..6f323a5def 100644
--- a/examples/unfinished/benchmark/benchmark.js
+++ b/examples/unfinished/benchmark/benchmark.js
@@ -2,14 +2,14 @@
 // to change this. See 'benchmark-scenarios.js' for the list of
 // scenarios.
 
+var PARAMS = {};
 if (Meteor.isServer) {
-  if (process.env.SCENARIO)
-    __meteor_runtime_config__.SCENARIO = process.env.SCENARIO;
-  else
-    __meteor_runtime_config__.SCENARIO = 'default';
+  if (!Meteor.settings.params)
+    throw new Error("Must set scenario with Meteor.settings");
+  __meteor_runtime_config__.PARAMS = PARAMS = Meteor.settings.params;
+} else {
+  PARAMS = __meteor_runtime_config__.PARAMS;
 }
-var PARAMS = SCENARIOS[__meteor_runtime_config__.SCENARIO];
-
 
 //////////////////////////////
 // Helper Functions
diff --git a/examples/unfinished/benchmark/run-local.sh b/examples/unfinished/benchmark/run-local.sh
index c78866b3bd..36259d8c0a 100755
--- a/examples/unfinished/benchmark/run-local.sh
+++ b/examples/unfinished/benchmark/run-local.sh
@@ -12,13 +12,15 @@ PROJDIR=`dirname $0`
 cd "$PROJDIR"
 PROJDIR=`pwd`
 
+SCENARIO="${1:-default}"
+
 # clean up from previous runs
 # XXX this is gross!
 pkill -f "$PROJDIR/.meteor/local/db" || true
 ../../../meteor reset || true
 
 # start the benchmark app
-../../../meteor --production --port 9000 &
+../../../meteor --production --settings "scenarios/${SCENARIO}.json" --port 9000 &
 OUTER_PID=$!
 
 
diff --git a/examples/unfinished/benchmark/scenarios/README.md b/examples/unfinished/benchmark/scenarios/README.md
new file mode 100644
index 0000000000..925fd1fe89
--- /dev/null
+++ b/examples/unfinished/benchmark/scenarios/README.md
@@ -0,0 +1,27 @@
+Parameters for simulation:
+
+Each document is randomly placed in a collection, with a random
+'bucket' field. Clients sub to 1 bucket in each collection.
+
+- numCollections
+    how many collections to spread the documents over
+- numBuckets
+    number of buckets per collection.
+
+- initialDocuments: Inital documents added by the server. Probably
+    not usefully combined with maxAgeSeconds
+
+- maxAgeSeconds: How long to leave documents in the database. This,
+    combined with all the various rates, determines the steady state
+    database size. In seconds. falsy to disable.
+
+Per-client action rates:
+- insertsPerSecond
+- updatesPerSecond
+- removesPerSecond
+
+- documentSize: bytes of randomness per document.
+    // XXX make this a random distribution?
+- documentNumFields: how many fields of randomness per document.
+
+XXX also max documents? (count and remove N)
diff --git a/examples/unfinished/benchmark/scenarios/bigdata-static.json b/examples/unfinished/benchmark/scenarios/bigdata-static.json
new file mode 100644
index 0000000000..8523c45360
--- /dev/null
+++ b/examples/unfinished/benchmark/scenarios/bigdata-static.json
@@ -0,0 +1,9 @@
+{
+  "params": {
+    "numCollections": 1,
+    "numBuckets": 1,
+    "initialDocuments": 1024,
+    "documentSize": 2048,
+    "documentNumFields": 64
+  }
+}
diff --git a/examples/unfinished/benchmark/scenarios/bigdata-updates.json b/examples/unfinished/benchmark/scenarios/bigdata-updates.json
new file mode 100644
index 0000000000..19e64db5d8
--- /dev/null
+++ b/examples/unfinished/benchmark/scenarios/bigdata-updates.json
@@ -0,0 +1,10 @@
+{
+  "params": {
+    "numCollections": 1,
+    "numBuckets": 1,
+    "initialDocuments": 1024,
+    "updatesPerSecond": 0.2,
+    "documentSize": 1024,
+    "documentNumFields": 32
+  }
+}
diff --git a/examples/unfinished/benchmark/scenarios/default.json b/examples/unfinished/benchmark/scenarios/default.json
new file mode 100644
index 0000000000..eab9f77d4b
--- /dev/null
+++ b/examples/unfinished/benchmark/scenarios/default.json
@@ -0,0 +1,13 @@
+{
+  "params": {
+    "numCollections": 1,
+    "numBuckets": 3,
+    "initialDocuments": 1,
+    "maxAgeSeconds": 60,
+    "insertsPerSecond": 1,
+    "updatesPerSecond": 1,
+    "removesPerSecond": 0.1,
+    "documentSize": 1024,
+    "documentNumFields": 8
+  }
+}
diff --git a/examples/unfinished/benchmark/scenarios/nodata.json b/examples/unfinished/benchmark/scenarios/nodata.json
new file mode 100644
index 0000000000..53460f0e07
--- /dev/null
+++ b/examples/unfinished/benchmark/scenarios/nodata.json
@@ -0,0 +1,7 @@
+{
+  "params": {
+    "numCollections": 1,
+    "numBuckets": 1,
+    "initialDocuments": 0
+  }
+}
diff --git a/examples/unfinished/jsparse-docs/.meteor/.gitignore b/examples/unfinished/jsparse-docs/.meteor/.gitignore
new file mode 100644
index 0000000000..4083037423
--- /dev/null
+++ b/examples/unfinished/jsparse-docs/.meteor/.gitignore
@@ -0,0 +1 @@
+local
diff --git a/examples/unfinished/jsparse-docs/.meteor/packages b/examples/unfinished/jsparse-docs/.meteor/packages
new file mode 100644
index 0000000000..12c5f051c0
--- /dev/null
+++ b/examples/unfinished/jsparse-docs/.meteor/packages
@@ -0,0 +1,6 @@
+# Meteor packages used by this project, one per line.
+#
+# 'meteor add' and 'meteor remove' will edit this file for you,
+# but you can also edit it by hand.
+
+autopublish
diff --git a/examples/unfinished/jsparse-docs/jsparse-docs.css b/examples/unfinished/jsparse-docs/jsparse-docs.css
new file mode 100644
index 0000000000..a233a3ffb0
--- /dev/null
+++ b/examples/unfinished/jsparse-docs/jsparse-docs.css
@@ -0,0 +1,42 @@
+
+p, .topnotes .nodespec { margin: 0.8em; }
+.topnotes {
+    background: #ffd;
+    margin-bottom: 2em;
+    margin-left: 1em;
+    margin-right: 1em;
+    border: 2px solid #ccc;    
+}
+
+.str { font-weight: bold; }
+.token { font-family: monospace; font-size: 110%; font-weight: bold; }
+.token, .tokentype { background: #ddd; padding: 2px 5px; }
+.tokentype { font-size: 85%; }
+.ref { font-style: italic; }
+.punc { font-size: 140%; }
+.comma { color: #fff; }
+.or { padding-left: 3px; padding-right: 3px; }
+
+.nodespec {
+  font-size: 16px;
+  margin: 1em 0;
+  line-height: 20px;
+}
+
+.indent {
+  margin-left: 2em;
+}
+
+.explan {
+  margin-left: 20em;
+  margin-right: 2em;
+  border: 1px solid #ccc;
+}
+
+#page { max-width: 50em; margin: 0 auto; }
+
+.spacer { text-align: center; font-size:50%; font-weight: bold; border-top: 1px solid #999;
+         margin-left: 6em; margin-right: 6em;
+        }
+
+code { font-weight: bold; }
diff --git a/examples/unfinished/jsparse-docs/jsparse-docs.html b/examples/unfinished/jsparse-docs/jsparse-docs.html
new file mode 100644
index 0000000000..8be0c0e386
--- /dev/null
+++ b/examples/unfinished/jsparse-docs/jsparse-docs.html
@@ -0,0 +1,279 @@
+<head>
+  <title>jsparse Docs</title>
+</head>
+
+<body>
+  <div id="page">
+    {{> page}}
+  </div>
+</body>
+
+<template name="page">
+
+<div class="topnotes">
+  <p>This is the spec for the JavaScript syntax tree returned by <code>jsparse</code>.</p>
+
+   <p>It's notable that <em>every token</em> from the source code appears in order in this syntax tree, which
+   is a Concrete Syntax Tree (CST) rather than an abstract AST.</p>
+  
+  {{spacer}}
+
+  <p>The tree consists of <strong>nodes</strong>
+    and <strong>tokens</strong>.  A node consists of a name followed
+    by zero or more child nodes or tokens.  A token consists of
+    one or more characters from the source code.</p>
+  <p>For example, the following tree, which might have come from parsing <code>1 + 2</code>,
+    contains nodes named <span class="str">"binary"</span>,
+    <span class="str">"number"</span>, and <span class="str">"number"</span>
+    and the tokens <span class="token">1</span>, <span class="token">+</span>,
+    and <span class="token">2</span>:</p>
+  
+    <p>{{#nodespec}}["binary", ["number", `1`], `+`, ["number", `2`]]{{/nodespec}}</p>
+
+  {{spacer}}
+    
+    <p>The following notation is used throughout this document to give schematic definitions of
+      the different types of nodes.</p>
+    
+    <p>An <span class="ref">italicized</span> word refers to a list of one or more possible
+      nodes or tokens that could fill a certain spot.  For example, the following is the
+      definition of the <span class="str">"binary"</span> node:</p>
+
+    <p>{{#nodespec}}["binary", expression, binaryOp, expression]{{/nodespec}}</p>
+
+    <p>The <span class="ref">expression</span> spot could be filled by one of over 20 types
+      of expression nodes, and if you look up <span class="ref">binaryOp</span> you'll see
+      it refers to any of a list of binary operator tokens.</p>
+
+    <p>A vertical bar (<span class="punc or">|</span>) separates alternatives, of which exactly
+      one must be present in the tree.  An ellipsis (<span class="punc">...</span>) stands
+      for a sequence of <em>zero or more</em> of the preceding item.  For example:</p>
+
+    {{#nodespec}}["program", (statement | functionDecl), ...]{{/nodespec}}
+
+    <p>This definition says that a program node contains zero or more items, each of which may be either a
+      <span class="ref">statement</span> or a <span class="ref">functionDecl</span>.</p>
+
+    <p>A question mark (<span class="punct">?</span>) indicates that the previous item
+      (or items enclosed in parentheses) may or may not present.</p>
+
+    <p>Token classes like <span class="tokentype">IDENTIFIER</span> match any token in the class.  The <span class="tokentype">BOOLEAN</span>, <span class="tokentype">NUMBER</span>, <span class="tokentype">STRING</span>, and <span class="tokentype">REGEX</span> classes are all literals.  An example <span class="tokentype">STRING</span> would be <span class="token">"hello"</span>.
+
+      {{spacer}}
+
+     <p>Some definitions with ellipses may seem strangely permissive, such as:</p>
+
+  {{#nodespec}}["varStmnt", `var`, (varDecl | `,`), ..., semi]{{/nodespec}}
+
+     <p>This seems to say that <code>var;</code> and <code>var,,x,</code> are valid statements.
+       The reason for this style of definition is to discourage reliance on exact comma
+       positions, which may occasionally vary between JavaScript implementations and versions.
+       For example, the 5th edition of ECMAScript allows a trailing comma in object literals whereas
+       the 3rd edition doesn't.</p>
+
+     <p>For most applications, the commas aren't that important, and you can read all the varDecls
+       by just skipping any commas you encounter.</p>
+      
+</div>
+
+{{#nodespec}}program:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["program", (statement | functionDecl), ...]{{/nodespec}}
+</div>
+
+{{#nodespec}}statement:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["expressionStmnt", expression, semi]{{/nodespec}}
+  <div class="explan">
+    <p>Function calls and assignments are expressions.</p>
+  </div>
+  {{#nodespec}}["emptyStmnt", `;`]{{/nodespec}}
+  <div class="explan">
+    <p>Only an actual <span class="token">;</span> token can create an empty statement.</p>
+  </div>
+  {{#nodespec}}["blockStmnt", `{`, statement, ..., `}`]{{/nodespec}}
+  {{#nodespec}}["varStmnt", `var`, (varDecl | `,`), ..., semi]{{/nodespec}}
+  <div class="explan">
+    <p>You can assume at least one varDecl is present.</p>
+  </div>
+  {{#nodespec}}["ifStmnt", `if`, `(`, expression, `)`, statement, (`else`, statement)?]{{/nodespec}}
+  {{#nodespec}}["whileStmnt", `while`, `(`, expression, `)`, statement]{{/nodespec}}
+  {{#nodespec}}["doStmnt", `do`, statement, `while`, `(`, expression, `)`, semi]{{/nodespec}}
+  {{#nodespec}}["forStmnt", `for`, `(`, forSpec, `)`, statement]{{/nodespec}}
+  {{#nodespec}}["returnStmnt", `return`, (expression | nil), semi]{{/nodespec}}
+  {{#nodespec}}["continueStmnt", `continue`, (IDENTIFIER | nil), semi]{{/nodespec}}
+  {{#nodespec}}["breakStmnt", `break`, (IDENTIFIER | nil), semi]{{/nodespec}}
+  {{#nodespec}}["throwStmnt", `throw`, expression, semi]{{/nodespec}}
+  {{#nodespec}}["withStmnt", `with`, `(`, expression, `)`, statement]{{/nodespec}}
+  {{#nodespec}}["switchStmnt", `switch`, `(`, expression, `)`, `{`, (case | default), ..., `}`]{{/nodespec}}
+  <div class="explan">
+    <p>There's at most one default clause, but it can be anywhere in the list of cases and defaults.</p>
+  </div>
+  {{#nodespec}}["tryStmnt", `try`, statement, (catch | nil), (finally | nil)]{{/nodespec}}
+  <div class="explan">
+    <p>The statement is always a blockStmnt.</p>
+  </div>
+  {{#nodespec}}["labelStmnt", IDENTIFIER, `:`, statement]{{/nodespec}}
+  {{#nodespec}}["debuggerStmnt", `debugger`, semi]{{/nodespec}}
+</div>
+
+{{#nodespec}}functionDecl:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["functionDecl", `function`, IDENTIFIER, `(`, (IDENTIFIER | `,`), ..., `)`, `{`, (statement | functionDecl), ..., `}`]{{/nodespec}}
+  <div class="explan">
+    <p>Different from a functionExpr only in that the function name is required and not optional.</p>
+  </div>
+</div>
+
+{{#nodespec}}expression:{{/nodespec}}
+<div class="indent">
+{{#nodespec}}["this", `this`]{{/nodespec}}
+{{#nodespec}}["null", `null`]{{/nodespec}}
+{{#nodespec}}["number", NUMBER]{{/nodespec}}
+{{#nodespec}}["boolean", BOOLEAN]{{/nodespec}}
+{{#nodespec}}["regex", REGEX]{{/nodespec}}
+{{#nodespec}}["string", STRING]{{/nodespec}}
+{{#nodespec}}["identifier", IDENTIFIER]{{/nodespec}}
+{{#nodespec}}["parens", `(`, expression, `)`]{{/nodespec}}
+{{#nodespec}}["array", `[`, (expression | `,`), ..., `]`]{{/nodespec}}
+  <div class="explan">
+    <p>All commas are significant because of element elision, and any
+      combination of commas and expressions is possible.
+    The array <code>[,,,7,,8,,]</code> has 7 and 8 as
+    its 3rd and 5th elements.</p>
+  </div>
+{{#nodespec}}["object", `{`, (prop | `,`), ..., `}`]{{/nodespec}}
+{{#nodespec}}["functionExpr", `function`, (IDENTIFIER | nil), `(`, (IDENTIFIER | `,`), ..., `)`, `{`, (statement | functionDecl), ..., `}`]{{/nodespec}}
+{{#nodespec}}["dot", expression, `.`, identifierName]{{/nodespec}}
+{{#nodespec}}["bracket", expression, `[`, expression, `]`]{{/nodespec}}
+{{#nodespec}}["call", expression, `(`, (expression | `,`), ...,  `)`]{{/nodespec}}
+{{#nodespec}}["new", `new`, expression]{{/nodespec}}
+{{#nodespec}}["newcall", `new`, expression, `(`, (expression | `,`), ...,  `)`]{{/nodespec}}
+{{#nodespec}}["unary", unaryOp, expression]{{/nodespec}}
+{{#nodespec}}["binary", expression, binaryOp, expression]{{/nodespec}}
+{{#nodespec}}["postfix", expression, postfixOp]{{/nodespec}}
+{{#nodespec}}["ternary", expression, `?`, expression, `:`, expression]{{/nodespec}}
+{{#nodespec}}["assignment", expression, assignmentOp, expression]{{/nodespec}}
+<div class="explan">
+<p>There is no simple constraint on what the first expression can be.
+  A left-hand-side expression could be a simple identifier like <code>foo</code>,
+or it could be any expression ending in a property access, such as <code>foo().bar[baz]</code>.
+Parentheses are also allowed around the left-hand side, so surprisingly <code>((x)) = 3</code>
+is completely legal and equivalent to <code>x = 3</code>.  This is because
+JavaScript evaluates the left-hand side all the way down to the final variable reference.</p>
+</div>
+{{#nodespec}}["comma", (expression | `,`), ...]{{/nodespec}}
+<div class="explan"><p>You can assume there are at least two expressions, since there would have been no comma otherwise.</p></div>
+</div>
+
+{{#nodespec}}nil:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["nil"]{{/nodespec}}
+  <div class="explan"><p>Serves as a placeholder for optional parts of nodes.</p></div>
+</div>
+
+{{#nodespec}}semi:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}[";"] | `;`{{/nodespec}}
+  <div class="explan">
+    <p>An optional semicolon at the end of a statement.  Most semicolons in JavaScript can legally
+    be omitted if a line break follows.  If the semicolon was omitted, a <span class="str">";"</span>
+    node takes its place.</p>
+  </div>
+</div>
+
+{{#nodespec}}prop:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["prop", propertyName, `:`, expression]{{/nodespec}}
+</div>
+
+{{#nodespec}}propertyName:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["idPropName", identifierName]{{/nodespec}}
+  {{#nodespec}}["strPropName", STRING]{{/nodespec}}
+  {{#nodespec}}["numPropName", NUMBER]{{/nodespec}}
+  <div class="explan">
+    <p>A property name in an object literal can be given as a bare identifier, a quoted string literal,
+    or a number literal.  These nodes indicate which it is.</p>
+  </div>
+</div>
+
+{{#nodespec}}varDecl:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["varDecl", IDENTIFIER, (`=`, expression)?]{{/nodespec}}
+</div>
+
+{{#nodespec}}forSpec:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["forSpec", (expression | nil), `;`, (expression | nil), `;`, (expression | nil)]{{/nodespec}}
+  {{#nodespec}}["forVarSpec", `var`, (varDecl | `,`), ..., `;`, (expression | nil), `;`, (expression | nil)]{{/nodespec}}
+  {{#nodespec}}["forInSpec", expression, `in`, expression]{{/nodespec}}
+  {{#nodespec}}["forVarInSpec", `var`, varDecl, `in`, expression]{{/nodespec}}
+  <div class="explan">
+    <p>There are technically four types of for-loops in JavaScript.</p>
+      <p>These definitions suggest some
+      odd possibilities, and interestingly, they work.  The form <code>for (x.foo in y)</code> will actually
+      set <code>x.foo</code> each time through the loop, and <code>for (var x = bar() in y)</code> will call
+      <code>bar()</code> and assign it first thing,
+      even if <code>x</code> is immediately overwritten before the first iteration of the loop.</p>
+    <p>The semicolons are mandatory, even at a line break.</p>
+  </div>
+</div>
+
+{{#nodespec}}case:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["case", `case`, expression, `:`, statement, ...]{{/nodespec}}
+</div>
+
+{{#nodespec}}default:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["default", `default`, `:`, statement, ...]{{/nodespec}}
+</div>
+
+{{#nodespec}}catch:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["catch", `catch`, `(`, IDENTIFIER, `)`, statement]{{/nodespec}}
+  <div class="explan">
+    <p>The statement is always a blockStmnt.</p>
+  </div>
+</div>
+
+{{#nodespec}}finally:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}["finally", `finally`, statement]{{/nodespec}}
+  <div class="explan">
+    <p>The statement is always a blockStmnt.</p>
+  </div>
+</div>
+
+{{#nodespec}}identifierName:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}(IDENTIFIER | KEYWORD | BOOLEAN | `null`){{/nodespec}}
+  <div class="explan">
+    <p>As of ECMAScript 5th edition, keywords and reserved words can be used in some places
+      where an identifier is expected.  For example, <code>x.return()</code> or
+      <code>{true: 'yes'}</code>.</p>
+  </div>
+</div>
+
+{{#nodespec}}unaryOp:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}(`delete` | `void` | `typeof` | `++` | `--` | `+` | `-` | `~` | `!`){{/nodespec}}
+</div>
+
+{{#nodespec}}binaryOp:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}(`*` | `/` | `%` | `+` | `-` | `<<` | `>>` | `>>>` | `<` | `>` | `<=` | `>=` | `instanceof` | `in` | `==` | `!=` | `===` | `!==` | `&` | `^` | `|` | `&&` | `||`){{/nodespec}}
+</div>
+
+{{#nodespec}}postfixOp:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}(`++` | `--`){{/nodespec}}
+</div>
+
+{{#nodespec}}assignmentOp:{{/nodespec}}
+<div class="indent">
+  {{#nodespec}}(`=` | `*=` | `/=` | `%=` | `+=` | `-=` | `<<=` | `>>=` | `>>>=` | `&=` | `^=` | `|=`){{/nodespec}}
+</div>
+
+</template>
diff --git a/examples/unfinished/jsparse-docs/jsparse-docs.js b/examples/unfinished/jsparse-docs/jsparse-docs.js
new file mode 100644
index 0000000000..dc1aee019d
--- /dev/null
+++ b/examples/unfinished/jsparse-docs/jsparse-docs.js
@@ -0,0 +1,67 @@
+
+
+if (Meteor.is_client) {
+  Template.page.nodespec = function (fn) {
+    var parts = [fn()];
+    var replaceParts = function(regex, replacementFunc) {
+      var newParts = [];
+      _.each(parts, function (part) {
+        if (typeof part !== 'string') {
+          newParts.push(part);
+          return;
+        }
+        regex.lastIndex = 0;
+        var charsTaken = 0;
+        var matchResult;
+        while ((matchResult = regex.exec(part))) {
+          var matchIndex = matchResult.index;
+          if (matchIndex > charsTaken)
+            newParts.push(part.substring(charsTaken, matchIndex));
+          charsTaken = regex.lastIndex;
+          var replacementParts = replacementFunc(matchResult);
+          newParts.push.apply(newParts, _.toArray(replacementParts));
+        }
+        if (charsTaken < part.length)
+          newParts.push(part.slice(charsTaken));
+      });
+      parts = newParts;
+    };
+
+    parts.unshift(['<div class="nodespec">']);
+    parts.push(['</div>']);
+    replaceParts(/".*?"/g, function (match) {
+      return [['<span class="str">', Handlebars._escape(match[0]), '</span>']];
+    });
+    replaceParts(/`(.*?)`/g, function (match) {
+      return [['<span class="token">', Handlebars._escape(match[1]), '</span>']];
+    });
+    replaceParts(/[A-Z]{3,}/g, function (match) {
+      return [['<span class="tokentype">', Handlebars._escape(match[0]), '</span>']];
+    });
+    replaceParts(/[a-z]\w*/g, function (match) {
+      return [['<span class="ref">', Handlebars._escape(match[0]), '</span>']];
+    });
+    replaceParts(/[\[\]()|.,*?]/g, function (match) {
+      return [['<span class="punc">'], match[0], ['</span>']];
+    });
+    replaceParts(/,/g, function (match) {
+      return [['<span class="comma">'], match[0], ['</span>']];
+    });
+    replaceParts(/\|/g, function (match) {
+      return [['<span class="or">'], match[0], ['</span>']];
+    });
+
+    var html = _.map(parts, function (part) {
+      if (typeof part === "string")
+        return Handlebars._escape(part);
+      return part.join('');
+    }).join('');
+
+    return new Handlebars.SafeString(html);
+  };
+
+  Template.page.spacer = function () {
+    return new Handlebars.SafeString('<div class="spacer">&nbsp;</div>');
+  };
+
+}
\ No newline at end of file
diff --git a/examples/wordplay/server/game.js b/examples/wordplay/server/game.js
index 2a6b6e33fd..31e2010dad 100644
--- a/examples/wordplay/server/game.js
+++ b/examples/wordplay/server/game.js
@@ -60,7 +60,7 @@ Meteor.setInterval(function () {
   var idle_threshold = now - 70*1000; // 70 sec
   var remove_threshold = now - 60*60*1000; // 1hr
 
-  Players.update({$lt: {last_keepalive: idle_threshold}},
+  Players.update({last_keepalive: {$lt: idle_threshold}},
                  {$set: {idle: true}});
 
   // XXX need to deal with people coming back!
diff --git a/meteor b/meteor
index 4957ac37cf..6ff0939e5d 100755
--- a/meteor
+++ b/meteor
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-BUNDLE_VERSION=0.2.8
+BUNDLE_VERSION=0.2.12
 
 # OS Check. Put here because here is where we download the precompiled
 # bundles that are arch specific.
@@ -58,6 +58,8 @@ function install_dev_bundle {
         test -x "${TMPDIR}/bin/node" # bomb out if it didn't work, eg no net
     fi
 
+    # Delete old dev bundle and rename the new one on top of it.
+    rm -rf "$SCRIPT_DIR/dev_bundle"
     mv "$TMPDIR" "$SCRIPT_DIR/dev_bundle"
 
     echo "Installed dependency kit v${BUNDLE_VERSION} in dev_bundle."
@@ -77,7 +79,6 @@ if [ -d "$SCRIPT_DIR/.git" ] || [ -f "$SCRIPT_DIR/.git" ]; then
     elif [ ! -f "$SCRIPT_DIR/dev_bundle/.bundle_version.txt" ] ||
         grep -qvx "$BUNDLE_VERSION" "$SCRIPT_DIR/dev_bundle/.bundle_version.txt" ; then
         echo "Your dependency kit is out of date. I will download the new one."
-        rm -rf "$SCRIPT_DIR/dev_bundle"
         install_dev_bundle
     fi
 
diff --git a/packages/accounts-base/accounts_server.js b/packages/accounts-base/accounts_server.js
index b0e27182aa..49caeb9159 100644
--- a/packages/accounts-base/accounts_server.js
+++ b/packages/accounts-base/accounts_server.js
@@ -219,7 +219,10 @@
       //     the profile too
       var stampedToken = Accounts._generateStampedLoginToken();
       var setAttrs = {};
-      setAttrs["services." + serviceName] = serviceData;
+      _.each(serviceData, function(value, key) {
+        setAttrs["services." + serviceName + "." + key] = value;
+      });
+
       // XXX Maybe we should re-use the selector above and notice if the update
       //     touches nothing?
       Meteor.users.update(
diff --git a/packages/accounts-base/accounts_tests.js b/packages/accounts-base/accounts_tests.js
index a60b8c0890..b5af997cdd 100644
--- a/packages/accounts-base/accounts_tests.js
+++ b/packages/accounts-base/accounts_tests.js
@@ -32,11 +32,13 @@ Tinytest.add('accounts - updateOrCreateUserFromExternalService', function (test)
   test.equal(users[0].profile.foo, 1);
   test.equal(users[0].profile.bar, undefined);
   test.equal(users[0].services.facebook.llama, 50);
-  test.equal(users[0].services.facebook.monkey, undefined);
+  // make sure we *don't* lose values not passed this call to
+  // updateOrCreateUserFromExternalService
+  test.equal(users[0].services.facebook.monkey, 42);
+
   // cleanup
   Meteor.users.remove(uid1);
 
-
   // users that have different service ids get different users
   uid1 = Accounts.updateOrCreateUserFromExternalService(
     'weibo', {id: weiboId1}, {profile: {foo: 1}}).id;
diff --git a/packages/accounts-facebook/facebook_client.js b/packages/accounts-facebook/facebook_client.js
index 42fa7c630a..caca4c0961 100644
--- a/packages/accounts-facebook/facebook_client.js
+++ b/packages/accounts-facebook/facebook_client.js
@@ -27,7 +27,6 @@
 
     Accounts.oauth.initiateLogin(state, loginUrl, callback);
   };
-
 })();
 
 
diff --git a/packages/accounts-facebook/facebook_login_button.css b/packages/accounts-facebook/facebook_login_button.css
new file mode 100644
index 0000000000..0da77ab20f
--- /dev/null
+++ b/packages/accounts-facebook/facebook_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-facebook {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAq0lEQVQ4jWP8//8/AyWAhYGBgcEmauYZBgYGYxL1nj2yLN2ECcohVTNcDwsxKlXlhRm6yzwZRAS5GRgYGBhsombC5ZhwaUIGyJrRAVEuwGYzSS7AB/C64MiydKx8ZJfgNeDN+68MDAwIL8D4RLsgIHsJis0wPjKgOAyoE4hcnGwMGkpiBBUbacvA2TfuvaKiC759/3X23NUnOPMDtgTEwMBwloGBgYGR0uwMAGOPLJS9mkQHAAAAAElFTkSuQmCC);
+}
diff --git a/packages/accounts-facebook/package.js b/packages/accounts-facebook/package.js
index 9b63589120..a9fb73a8aa 100644
--- a/packages/accounts-facebook/package.js
+++ b/packages/accounts-facebook/package.js
@@ -9,7 +9,7 @@ Package.on_use(function(api) {
   api.use('templating', 'client');
 
   api.add_files(
-    ['facebook_configure.html', 'facebook_configure.js'],
+    ['facebook_login_button.css', 'facebook_configure.html', 'facebook_configure.js'],
     'client');
 
   api.add_files('facebook_common.js', ['client', 'server']);
diff --git a/packages/accounts-github/github_login_button.css b/packages/accounts-github/github_login_button.css
new file mode 100644
index 0000000000..e1893da5ad
--- /dev/null
+++ b/packages/accounts-github/github_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-github {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wJGBYxHYxl31wAAAHpSURBVDjLpZI/aFNRFMZ/973bJqGRPopV4qNq/+SpTYnWRhCKilShg9BGcHOM+GfQoZuLk4iLgw4qZNBaHLuIdBNHl7Ta1qdNFI3SihnaNG1MpH3vuiQYQnwZvHCG893zffc751z4z6PX5T5gA1DAKnAaOAQEgAfAVeCpl+CeCrlRuEC6maO4h0A1wl4tPAHMqNUthvrDdHYY7A3t4rDVjeO6rBU2FaABM1WCrBNoi48Mi+nH9yj+KtPibAKwJXfQ5vcRG7soUnYmWEuQgAEIYBv4cGpoILI0Z4tyYYPegS6UguyijZQ6J45GSNmZHzUcJYD2ii2Ajv7efZ8WZ6ZwXFj79hXpayW4O0SL1Nl/8jzZlZ9dQLFS70pgvZKIyGD0yvu5eRmMnrk1PjI81ir1qBACTdPevXj95mVuNX8XKDQc/+T334bZZ104cvzYw2s3J3qAL5WXSsDbf61NNMBu+wOBs+VSyQ84Nfhg028ZGx3/qyy0lC7lgi7lghBitoon03lvB8l0/k7Wnk+8mny0cyXzEcfZxgwfZPTyRMHsOzAFXE9YhtNQIJnOx4FpJXT1eSkn2g0frqMoFrfoCXcqlCOAGwnLuO/l4JymcWl5uRxzXUKghBAiZ5r+WaV4lrCM555zqO+x2d0ftGmpiA/0k70AAAAASUVORK5CYII=);
+}
diff --git a/packages/accounts-github/package.js b/packages/accounts-github/package.js
index 99187fb043..e1fc2f4eb8 100644
--- a/packages/accounts-github/package.js
+++ b/packages/accounts-github/package.js
@@ -9,7 +9,7 @@ Package.on_use(function(api) {
   api.use('templating', 'client');
 
   api.add_files(
-    ['github_configure.html', 'github_configure.js'],
+    ['github_login_button.css', 'github_configure.html', 'github_configure.js'],
     'client');
 
   api.add_files('github_common.js', ['client', 'server']);
diff --git a/packages/accounts-google/google_client.js b/packages/accounts-google/google_client.js
index 75d1a3da2f..bfcd83f605 100644
--- a/packages/accounts-google/google_client.js
+++ b/packages/accounts-google/google_client.js
@@ -15,25 +15,25 @@
     var state = Meteor.uuid();
 
     // always need this to get user id from google.
-    var required_scope = ['https://www.googleapis.com/auth/userinfo.profile'];
+    var requiredScope = ['https://www.googleapis.com/auth/userinfo.profile'];
     var scope = ['https://www.googleapis.com/auth/userinfo.email'];
     if (options && options.requestPermissions)
       scope = options.requestPermissions;
-    scope = _.union(scope, required_scope);
-    var flat_scope = _.map(scope, encodeURIComponent).join('+');
+    scope = _.union(scope, requiredScope);
+    var flatScope = _.map(scope, encodeURIComponent).join('+');
 
-    // Might be good to have a way to set access_type=offline. Need to
-    // both set it here and store the refresh token on the server.
+    // https://developers.google.com/accounts/docs/OAuth2WebServer#formingtheurl
+    var accessType = options.requestOfflineToken ? 'offline' : 'online';
 
     var loginUrl =
           'https://accounts.google.com/o/oauth2/auth' +
           '?response_type=code' +
           '&client_id=' + config.clientId +
-          '&scope=' + flat_scope +
+          '&scope=' + flatScope +
           '&redirect_uri=' + Meteor.absoluteUrl('_oauth/google?close') +
-          '&state=' + state;
+          '&state=' + state +
+          '&access_type=' + accessType;
 
     Accounts.oauth.initiateLogin(state, loginUrl, callback);
   };
-
 }) ();
diff --git a/packages/accounts-google/google_configure.js b/packages/accounts-google/google_configure.js
index c5740c6c9f..69d11683c9 100644
--- a/packages/accounts-google/google_configure.js
+++ b/packages/accounts-google/google_configure.js
@@ -7,4 +7,4 @@ Template.configureLoginServiceDialogForGoogle.fields = function () {
     {property: 'clientId', label: 'Client ID'},
     {property: 'secret', label: 'Client secret'}
   ];
-};
\ No newline at end of file
+};
diff --git a/packages/accounts-google/google_login_button.css b/packages/accounts-google/google_login_button.css
new file mode 100644
index 0000000000..b9a3ecb0eb
--- /dev/null
+++ b/packages/accounts-google/google_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-google {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAADCklEQVQ4jSXSy2ucVRjA4d97zvdNJpPJbTJJE9rYaCINShZtRCFIA1bbLryBUlyoLQjqVl12W7UbN4qb1gtuYhFRRBCDBITaesFbbI3RFBLSptEY05l0ZjLfnMvrov/Bs3gAcF71x6VVHTk+o8nDH+hrH89rUK9Z9Yaen57S3wVtGaMBNGC0IegWKIDxTtVaOHVugZVmH3HX3Zz+4l+W1xvkOjuZfPsspY4CNkZELEgEIJKwYlBjEwjec/mfCMVuorVs76R8+P0KYMmP30U2dT8eIZqAR2ipRcWjEYxGSCRhV08e04oYMoxYLi97EI9YCJ0FHBYbIVGDlUBLwRlLIuYW6chEmQt/rJO09RJjhjEJEYvJYGNhkbUhw43OXtIWDFRq9G87nAaSK6sVRm8r8fzRMWbOX2Xx7ypd7ZET03sQhDOz73DqSJOrd+7HSo4QIu0Nx/4rOzx+cRXZ9+z7+uqJ+3hiepxK3fHZT2tMjXYzOtzL6dmznPzhLexgN0QlxAAYxAlqUqRmkf5j59RlNQ6MFHhgcpCTTx8EUb5e+plD7x4jjg1ANCAgrRQAdR7xKXjBlGyLYi7PxaUmb8z8xcpGHVXLHaXdjI0egKyJiQYTEhSPREVIEUBNC+Mqm+xpz3j0njLPHB2nsh1QgeG+IS48dYbD5YNoo0ZUAbVEuTUoKuBSZOarX/WhyQn6eg2+usDWf0s0tq8zNPYk+WI/Lnge++hlvlyfQ3NdECzGRWKwEEA0qNY251n69kV6+Y0kbaCZoebG2X3oU7pKoyxuXOPe945zs9DCeosGIXoBDyaLdf6ce4Hbk+/Y299ksKtAuaeNsiyw8c1LKIZ95b0MdgxA5giixACpTxEPSau6QdFfI5/2cLPmEW+JAQrtJUJzDXF1dkwHzVodJMX4HFEcQQMaFdPeM0Jb/4PUtzzaLKAhRyJFwo6lbegRNFfk819muV5dR4JBQoQdQ2xFiDmSNDHiaptamR9Gq5cQ18AledrGDpOfeI5Lq8u88smbhMRisoSAgAYghdfn5H/JkHuRZ1owLAAAAABJRU5ErkJggg==);
+}
diff --git a/packages/accounts-google/google_server.js b/packages/accounts-google/google_server.js
index 167e5f1b75..ee0b6be698 100644
--- a/packages/accounts-google/google_server.js
+++ b/packages/accounts-google/google_server.js
@@ -2,20 +2,34 @@
 
   Accounts.oauth.registerService('google', 2, function(query) {
 
-    var accessToken = getAccessToken(query);
+    var response = getTokens(query);
+    var accessToken = response.accessToken;
     var identity = getIdentity(accessToken);
 
+    var serviceData = {
+      id: identity.id,
+      accessToken: accessToken,
+      email: identity.email,
+      expiresAt: (+new Date) + (1000 * response.expiresIn)
+    };
+
+    // only set the token in serviceData if it's there. this ensures
+    // that we don't lose old ones (since we only get this on the first
+    // log in attempt)
+    if (response.refreshToken)
+      serviceData.refreshToken = response.refreshToken;
+
     return {
-      serviceData: {
-        id: identity.id,
-        accessToken: accessToken,
-        email: identity.email
-      },
+      serviceData: serviceData,
       options: {profile: {name: identity.name}}
     };
   });
 
-  var getAccessToken = function (query) {
+  // returns an object containing:
+  // - accessToken
+  // - expiresIn: lifetime of token in seconds
+  // - refreshToken, if this is the first authorization request
+  var getTokens = function (query) {
     var config = Accounts.loginServiceConfiguration.findOne({service: 'google'});
     if (!config)
       throw new Accounts.ConfigError("Service not configured");
@@ -33,7 +47,12 @@
       throw result.error;
     if (result.data.error) // if the http response was a json object with an error attribute
       throw result.data;
-    return result.data.access_token;
+
+    return {
+      accessToken: result.data.access_token,
+      refreshToken: result.data.refresh_token,
+      expiresIn: result.data.expires_in
+    };
   };
 
   var getIdentity = function (accessToken) {
diff --git a/packages/accounts-google/package.js b/packages/accounts-google/package.js
index e6484baadb..e8c799276f 100644
--- a/packages/accounts-google/package.js
+++ b/packages/accounts-google/package.js
@@ -9,7 +9,7 @@ Package.on_use(function(api) {
   api.use('templating', 'client');
 
   api.add_files(
-    ['google_configure.html', 'google_configure.js'],
+    ['google_login_button.css', 'google_configure.html', 'google_configure.js'],
     'client');
 
   api.add_files('google_common.js', ['client', 'server']);
diff --git a/packages/accounts-oauth1-helper/oauth1_binding.js b/packages/accounts-oauth1-helper/oauth1_binding.js
index 835ca74cc1..0497dbe46d 100644
--- a/packages/accounts-oauth1-helper/oauth1_binding.js
+++ b/packages/accounts-oauth1-helper/oauth1_binding.js
@@ -51,19 +51,27 @@ OAuth1Binding.prototype.prepareAccessToken = function(query) {
   self.accessTokenSecret = tokens.oauth_token_secret;
 };
 
-OAuth1Binding.prototype.call = function(method, url) {
+OAuth1Binding.prototype.call = function(method, url, params) {
   var self = this;
 
   var headers = self._buildHeader({
     oauth_token: self.accessToken
   });
 
-  var response = self._call(method, url, headers);
-  return response.data;
+  if(!params) {
+    params = {};
+  }
+
+  var response = self._call(method, url, headers, params);
+  return response;
 };
 
-OAuth1Binding.prototype.get = function(url) {
-  return this.call('GET', url);
+OAuth1Binding.prototype.get = function(url, params) {
+  return this.call('GET', url, params);
+};
+
+OAuth1Binding.prototype.post = function(url, params) {
+  return this.call('POST', url, params);
 };
 
 OAuth1Binding.prototype._buildHeader = function(headers) {
@@ -77,9 +85,9 @@ OAuth1Binding.prototype._buildHeader = function(headers) {
   }, headers);
 };
 
-OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, accessTokenSecret) {
+OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, accessTokenSecret, params) {
   var self = this;
-  var headers = self._encodeHeader(rawHeaders);
+  var headers = self._encodeHeader(_.extend(rawHeaders, params));
 
   var parameters = _.map(headers, function(val, key) {
     return key + '=' + val;
@@ -87,13 +95,13 @@ OAuth1Binding.prototype._getSignature = function(method, url, rawHeaders, access
 
   var signatureBase = [
     method,
-    encodeURIComponent(url),
-    encodeURIComponent(parameters)
+    self._encodeString(url),
+    self._encodeString(parameters)
   ].join('&');
 
-  var signingKey = encodeURIComponent(self._secret) + '&';
+  var signingKey = self._encodeString(self._secret) + '&';
   if (accessTokenSecret)
-    signingKey += encodeURIComponent(accessTokenSecret);
+    signingKey += self._encodeString(accessTokenSecret);
 
   return crypto.createHmac('SHA1', signingKey).update(signatureBase).digest('base64');
 };
@@ -102,7 +110,7 @@ OAuth1Binding.prototype._call = function(method, url, headers, params) {
   var self = this;
 
   // Get the signature
-  headers.oauth_signature = self._getSignature(method, url, headers, self.accessTokenSecret);
+  headers.oauth_signature = self._getSignature(method, url, headers, self.accessTokenSecret, params);
 
   // Make a authorization string according to oauth1 spec
   var authString = self._getAuthHeaderString(headers);
@@ -117,6 +125,8 @@ OAuth1Binding.prototype._call = function(method, url, headers, params) {
 
   if (response.error) {
     Meteor._debug('Error sending OAuth1 HTTP call', response.content, method, url, params, authString);
+    if (response.statusCode) response.error.statusCode = response.statusCode;
+    if (response.data) response.error.data = response.data;
     throw response.error;
   }
 
@@ -124,14 +134,20 @@ OAuth1Binding.prototype._call = function(method, url, headers, params) {
 };
 
 OAuth1Binding.prototype._encodeHeader = function(header) {
+  var self = this;
   return _.reduce(header, function(memo, val, key) {
-    memo[encodeURIComponent(key)] = encodeURIComponent(val);
+    memo[self._encodeString(key)] = self._encodeString(val);
     return memo;
   }, {});
 };
 
+OAuth1Binding.prototype._encodeString = function(str) {
+  return encodeURIComponent(str).replace(/[!'()]/g, escape).replace(/\*/g, "%2A");
+};
+
 OAuth1Binding.prototype._getAuthHeaderString = function(headers) {
+  var self = this;
   return 'OAuth ' +  _.map(headers, function(val, key) {
-    return encodeURIComponent(key) + '="' + encodeURIComponent(val) + '"';
+    return self._encodeString(key) + '="' + self._encodeString(val) + '"';
   }).sort().join(', ');
 };
diff --git a/packages/accounts-password/password_client.js b/packages/accounts-password/password_client.js
index 0f9f8e8211..e49cddb737 100644
--- a/packages/accounts-password/password_client.js
+++ b/packages/accounts-password/password_client.js
@@ -156,4 +156,3 @@
       userCallback: callback});
   };
 })();
-
diff --git a/packages/accounts-twitter/package.js b/packages/accounts-twitter/package.js
index bae64bbd53..eeac247033 100644
--- a/packages/accounts-twitter/package.js
+++ b/packages/accounts-twitter/package.js
@@ -9,7 +9,7 @@ Package.on_use(function(api) {
   api.use('templating', 'client');
 
   api.add_files(
-    ['twitter_configure.html', 'twitter_configure.js'],
+    ['twitter_login_button.css', 'twitter_configure.html', 'twitter_configure.js'],
     'client');
 
   api.add_files('twitter_common.js', ['client', 'server']);
diff --git a/packages/accounts-twitter/twitter_client.js b/packages/accounts-twitter/twitter_client.js
index 3eb979d57d..a9fd891a17 100644
--- a/packages/accounts-twitter/twitter_client.js
+++ b/packages/accounts-twitter/twitter_client.js
@@ -30,5 +30,4 @@
 
     Accounts.oauth.initiateLogin(state, url, callback);
   };
-
 })();
diff --git a/packages/accounts-twitter/twitter_login_button.css b/packages/accounts-twitter/twitter_login_button.css
new file mode 100644
index 0000000000..d3ee6cd8fa
--- /dev/null
+++ b/packages/accounts-twitter/twitter_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-twitter {
+  background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAByklEQVQ4jaVTz0sbQRh92V10l006GaKJCtEtmqMYU0Qpwqb4B6zgXdT0WEr7B0ih4MGLP05CUWMvHkQwglhvGhsvKmJOBhTUQjWU2slilKarrAfdZROTQ8m7fPMx33szb75vXKZpohpwVbEBCNaCMUYopXppAWOMxDNsOPf3H1WIeDoSURYYYwQAKKW6y7KgLe2vam11KyMRZcEpEP6SOkwbUgc4ATAKUF8YW2fXhZejvaHPsc7gvH2DnCfQGEtdxrd/5NRJteUDpVTf+5kLp2WlA6JsCyZv9ChplPKdTfJZkYWhEF3bvnV3fb36NZSY3dP6Q/5V4hFvIAaKPckE8W5pLBIQdwHAthBdPtpJuhpeAwDu74DrP4/R1/Ts4cwBWg/gN+DowoSqTBPezAMAeAHw+suSw4Q7schFApF6af19a+2yLVIB7xR+0Zk75yCveu82FMnMViKHCXcSa3PPVBJAX5BszL2SP2kNwvdy5M1e+S2AogME4HFYPibPpxKZC03nRAp/M+Dx2UWDzTXfpttrx72ikCoVtrrAAwgdXBk9iazxxtpskfhs1O86aHXXpAEcA7ivJGDBDcDnyAsA2FMsi1KB/0bVv/EBBBSY9mZ7PAsAAAAASUVORK5CYII=);
+}
diff --git a/packages/accounts-twitter/twitter_server.js b/packages/accounts-twitter/twitter_server.js
index 4008224b3d..0a19516159 100644
--- a/packages/accounts-twitter/twitter_server.js
+++ b/packages/accounts-twitter/twitter_server.js
@@ -1,7 +1,7 @@
 (function () {
 
   Accounts.oauth.registerService('twitter', 1, function(oauthBinding) {
-    var identity = oauthBinding.get('https://api.twitter.com/1/account/verify_credentials.json');
+    var identity = oauthBinding.get('https://api.twitter.com/1/account/verify_credentials.json').data;
 
     return {
       serviceData: {
diff --git a/packages/accounts-ui-unstyled/accounts_ui.js b/packages/accounts-ui-unstyled/accounts_ui.js
index 770a77c9de..75ed55e7c4 100644
--- a/packages/accounts-ui-unstyled/accounts_ui.js
+++ b/packages/accounts-ui-unstyled/accounts_ui.js
@@ -3,14 +3,15 @@ if (!Accounts.ui)
 
 if (!Accounts.ui._options) {
   Accounts.ui._options = {
-    requestPermissions: {}
+    requestPermissions: {},
+    requestOfflineToken: {}
   };
 }
 
 
 Accounts.ui.config = function(options) {
   // validate options keys
-  var VALID_KEYS = ['passwordSignupFields', 'requestPermissions'];
+  var VALID_KEYS = ['passwordSignupFields', 'requestPermissions', 'requestOfflineToken'];
   _.each(_.keys(options), function (key) {
     if (!_.contains(VALID_KEYS, key))
       throw new Error("Accounts.ui.config: Invalid key: " + key);
@@ -45,6 +46,20 @@ Accounts.ui.config = function(options) {
       }
     });
   }
+
+  // deal with `requestOfflineToken`
+  if (options.requestOfflineToken) {
+    _.each(options.requestOfflineToken, function (value, service) {
+      if (service !== 'google')
+        throw new Error("Accounts.ui.config: `requestOfflineToken` only supported for Google login at the moment.");
+
+      if (Accounts.ui._options.requestOfflineToken[service]) {
+        throw new Error("Accounts.ui.config: Can't set `requestOfflineToken` more than once for " + service);
+      } else {
+        Accounts.ui._options.requestOfflineToken[service] = value;
+      }
+    });
+  }
 };
 
 Accounts.ui._passwordSignupFields = function () {
diff --git a/packages/accounts-ui-unstyled/accounts_ui_tests.js b/packages/accounts-ui-unstyled/accounts_ui_tests.js
index e65989f5d8..a8f4fc40f5 100644
--- a/packages/accounts-ui-unstyled/accounts_ui_tests.js
+++ b/packages/accounts-ui-unstyled/accounts_ui_tests.js
@@ -1,3 +1,9 @@
+// XXX Most of the testing of accounts-ui is done manually, across
+// multiple browsers using examples/unfinished/accounts-ui-helper. We
+// should *definitely* automate this, but Tinytest is generally not
+// the right abstraction to use for this.
+
+
 // XXX it'd be cool to also test that the right thing happens if options
 // *are* validated, but Accouns.ui._options is global state which makes this hard
 // (impossible?)
@@ -14,4 +20,3 @@ Tinytest.add('accounts-ui - config validates keys', function (test) {
     Accounts.ui.config({requestPermissions: {facebook: "not an array"}});
   });
 });
-
diff --git a/packages/accounts-ui-unstyled/login_buttons.js b/packages/accounts-ui-unstyled/login_buttons.js
index b2c94bd6d4..415072bb8c 100644
--- a/packages/accounts-ui-unstyled/login_buttons.js
+++ b/packages/accounts-ui-unstyled/login_buttons.js
@@ -115,18 +115,51 @@
     return '';
   };
 
+  // returns an array of the login services used by this app. each
+  // element of the array is an object (eg {name: 'facebook'}), since
+  // that makes it useful in combination with handlebars {{#each}}.
+  //
+  // NOTE: It is very important to have this return password last
+  // because of the way we render the different providers in
+  // login_buttons_dropdown.html
   Accounts._loginButtons.getLoginServices = function () {
-    var ret = [];
-    // make sure to put password last, since this is how it is styled
-    // in the ui as well.
-    _.each(
-      ['facebook', 'github', 'google', 'twitter', 'weibo', 'password'],
-      function (service) {
-        if (Accounts[service])
-          ret.push({name: service});
-      });
+    var self = this;
+    var services = [];
 
-    return ret;
+    // find all methods of the form: `Meteor.loginWithFoo`, where
+    // `Foo` corresponds to a login service
+    //
+    // XXX we should consider having a client-side
+    // Accounts.oauth.registerService function which records the
+    // active services and encapsulates boilerplate code now found in
+    // files such as facebook_client.js. This would have the added
+    // benefit of allow us to unify facebook_{client,common,server}.js
+    // into one file, which would encourage people to build more login
+    // services packages.
+    _.each(_.keys(Meteor), function(methodName) {
+      var match;
+      if ((match = methodName.match(/^loginWith(.*)/))) {
+        var serviceName = match[1].toLowerCase();
+
+        // HACKETY HACK. needed to not match
+        // Meteor.loginWithToken. See XXX above.
+        if (Accounts[serviceName])
+          services.push(match[1].toLowerCase());
+      }
+    });
+
+    // Be equally kind to all login services. This also preserves
+    // backwards-compatibility. (But maybe order should be
+    // configurable?)
+    services.sort();
+
+    // ensure password is last
+    if (_.contains(services, 'password'))
+      services = _.without(services, 'password').concat(['password']);
+
+    return _.map(services, function(name) {
+      return {name: name};
+    });
   };
 
   Accounts._loginButtons.hasPasswordService = function () {
diff --git a/packages/accounts-ui-unstyled/login_buttons_dialogs.js b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
index 8252258538..6a9313450b 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dialogs.js
+++ b/packages/accounts-ui-unstyled/login_buttons_dialogs.js
@@ -162,6 +162,8 @@
         var configuration = {
           service: serviceName
         };
+
+        // Fetch the value of each input field
         _.each(configurationFields(), function(field) {
           configuration[field.property] = document.getElementById(
             'configure-login-service-dialog-' + field.property).value
@@ -229,7 +231,6 @@
     return loginButtonsSession.get('configureLoginServiceDialogSaveDisabled');
   };
 
-
   // XXX from http://epeli.github.com/underscore.string/lib/underscore.string.js
   var capitalize = function(str){
     str = str == null ? '' : String(str);
diff --git a/packages/accounts-ui-unstyled/login_buttons_dropdown.html b/packages/accounts-ui-unstyled/login_buttons_dropdown.html
index 2f85950873..f7d4a16f61 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dropdown.html
+++ b/packages/accounts-ui-unstyled/login_buttons_dropdown.html
@@ -156,6 +156,26 @@
   </div>
 </template>
 
+
+<!--
+This strategy for login forms means that browsers' "Remember password"
+functionality does not work. Different browsers have different
+requirements for remembering passwords:
+
+- Firefox: Must be an actual form (with a submit button), but you can
+cancel the submit with onsubmit='return false'.
+
+- Safari: Must be an actual form, and the form must actually be
+submitted somewhere (though it can target a hidden iframe and go to a
+bogus URL)
+
+- Chrome: Must be an actual form, and the the form elements must be
+present in the initial HTML, not added to the page with javascript. This
+basically rules out using normal meteor templates.
+
+https://gist.github.com/968927
+-->
+
 <template name="_loginButtonsFormField">
   {{#if visible}}
     <div id="login-{{fieldName}}-label-and-input">
diff --git a/packages/accounts-ui-unstyled/login_buttons_dropdown.js b/packages/accounts-ui-unstyled/login_buttons_dropdown.js
index cd3f56a448..5eee397499 100644
--- a/packages/accounts-ui-unstyled/login_buttons_dropdown.js
+++ b/packages/accounts-ui-unstyled/login_buttons_dropdown.js
@@ -180,6 +180,7 @@
     return Accounts._loginButtons.hasPasswordService();
   };
 
+  // return all login services, with password last
   Template._loginButtonsLoggedOutAllServices.services = function () {
     return Accounts._loginButtons.getLoginServices();
   };
diff --git a/packages/accounts-ui-unstyled/login_buttons_images.css b/packages/accounts-ui-unstyled/login_buttons_images.css
deleted file mode 100644
index 07e05215ba..0000000000
--- a/packages/accounts-ui-unstyled/login_buttons_images.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/* These should be in their respective packages. https://app.asana.com/0/988582960612/1477837179813 */
-
-#login-buttons-image-google {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAADCklEQVQ4jSXSy2ucVRjA4d97zvdNJpPJbTJJE9rYaCINShZtRCFIA1bbLryBUlyoLQjqVl12W7UbN4qb1gtuYhFRRBCDBITaesFbbI3RFBLSptEY05l0ZjLfnMvrov/Bs3gAcF71x6VVHTk+o8nDH+hrH89rUK9Z9Yaen57S3wVtGaMBNGC0IegWKIDxTtVaOHVugZVmH3HX3Zz+4l+W1xvkOjuZfPsspY4CNkZELEgEIJKwYlBjEwjec/mfCMVuorVs76R8+P0KYMmP30U2dT8eIZqAR2ipRcWjEYxGSCRhV08e04oYMoxYLi97EI9YCJ0FHBYbIVGDlUBLwRlLIuYW6chEmQt/rJO09RJjhjEJEYvJYGNhkbUhw43OXtIWDFRq9G87nAaSK6sVRm8r8fzRMWbOX2Xx7ypd7ZET03sQhDOz73DqSJOrd+7HSo4QIu0Nx/4rOzx+cRXZ9+z7+uqJ+3hiepxK3fHZT2tMjXYzOtzL6dmznPzhLexgN0QlxAAYxAlqUqRmkf5j59RlNQ6MFHhgcpCTTx8EUb5e+plD7x4jjg1ANCAgrRQAdR7xKXjBlGyLYi7PxaUmb8z8xcpGHVXLHaXdjI0egKyJiQYTEhSPREVIEUBNC+Mqm+xpz3j0njLPHB2nsh1QgeG+IS48dYbD5YNoo0ZUAbVEuTUoKuBSZOarX/WhyQn6eg2+usDWf0s0tq8zNPYk+WI/Lnge++hlvlyfQ3NdECzGRWKwEEA0qNY251n69kV6+Y0kbaCZoebG2X3oU7pKoyxuXOPe945zs9DCeosGIXoBDyaLdf6ce4Hbk+/Y299ksKtAuaeNsiyw8c1LKIZ95b0MdgxA5giixACpTxEPSau6QdFfI5/2cLPmEW+JAQrtJUJzDXF1dkwHzVodJMX4HFEcQQMaFdPeM0Jb/4PUtzzaLKAhRyJFwo6lbegRNFfk819muV5dR4JBQoQdQ2xFiDmSNDHiaptamR9Gq5cQ18AledrGDpOfeI5Lq8u88smbhMRisoSAgAYghdfn5H/JkHuRZ1owLAAAAABJRU5ErkJggg==);
-}
-
-#login-buttons-image-facebook {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAq0lEQVQ4jWP8//8/AyWAhYGBgcEmauYZBgYGYxL1nj2yLN2ECcohVTNcDwsxKlXlhRm6yzwZRAS5GRgYGBhsombC5ZhwaUIGyJrRAVEuwGYzSS7AB/C64MiydKx8ZJfgNeDN+68MDAwIL8D4RLsgIHsJis0wPjKgOAyoE4hcnGwMGkpiBBUbacvA2TfuvaKiC759/3X23NUnOPMDtgTEwMBwloGBgYGR0uwMAGOPLJS9mkQHAAAAAElFTkSuQmCC);
-}
-
-#login-buttons-image-weibo {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKySURBVDhPY2AgEpR5sjf/nS/6//UkoX+XJltuCvVxkcOp9cyZM1w/r13TuXvmDD9MkYIwg7qrNrubnzFb6J5intPHqrnvCnIwyKIYsmrVKuaFYWEFW2Sk79zX0f6/REHhKFABC0zRsky+rXMSeZdKCTLIHqgUvLAknW8L3IAQDw/RFlbWnQ801P+DNN8D4n0qyk94GRiEjTg5Lbz4+YOCdbhjVmTxbZwex7PUW58t8O1Ukf9gA2IDAoRPWFudfayt9f+mpsb/6yrK/28qKf4/ISf7YZu83K07QMNe6On9nyWusMtVm813azH/UWctZo/vc8TABjB3CApufAzSqKjw/7apyf+nMdH/XxUX/X+RnfX/qY/3/5tqqv/vq6v936KsfB2onltaiEHGx5AteFep4EmGUEHB1Adamv9v6er8fztp0v//79////nr1/+3X778B4N///5/O3jw/0N39//nlBQ/louLd4MMAWImcPhsU1G6DfLvt717wepnz537X0FB4T8fL+//AH///2/evgWL/7l///9dE+P/b4AWTZSWXg/UzAj2/w2gs59mZYEV7d+//z8rE9N/JUXF/w62tiD//a+urIS4BAgeA712Cxg2F40M36alpXGBDTgmI/3hdUU5WEFjff3/wvx8MNvcxARsQE1VFUQ30Et37Oz+P1RV+b/J0nIjUATigmgBvtzH5mb//9++/f/mkyf/A4KC/nv7+oI1W1hb/3/1+fP//9+//39ekP//CVDzTlnZxxtnz1ZBSUDeDAyZh7W13nybOeP/7W1b/09rbf2/FhgWHy9c+P912bL/D11d/l+WEP8/SUR4Ox8DA6pmmEkpHh4ya0JCim4lJGx7kZp8821CwrN7Hh4Pr7m6nDoSET61PjDQichsA3T7//+s/16/5gXSkIAa1AAAh8dhOVd5xHAAAAAASUVORK5CYII=);
-}
-
-#login-buttons-image-twitter {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsTAAALEwEAmpwYAAAByklEQVQ4jaVTz0sbQRh92V10l006GaKJCtEtmqMYU0Qpwqb4B6zgXdT0WEr7B0ih4MGLP05CUWMvHkQwglhvGhsvKmJOBhTUQjWU2slilKarrAfdZROTQ8m7fPMx33szb75vXKZpohpwVbEBCNaCMUYopXppAWOMxDNsOPf3H1WIeDoSURYYYwQAKKW6y7KgLe2vam11KyMRZcEpEP6SOkwbUgc4ATAKUF8YW2fXhZejvaHPsc7gvH2DnCfQGEtdxrd/5NRJteUDpVTf+5kLp2WlA6JsCyZv9ChplPKdTfJZkYWhEF3bvnV3fb36NZSY3dP6Q/5V4hFvIAaKPckE8W5pLBIQdwHAthBdPtpJuhpeAwDu74DrP4/R1/Ts4cwBWg/gN+DowoSqTBPezAMAeAHw+suSw4Q7schFApF6af19a+2yLVIB7xR+0Zk75yCveu82FMnMViKHCXcSa3PPVBJAX5BszL2SP2kNwvdy5M1e+S2AogME4HFYPibPpxKZC03nRAp/M+Dx2UWDzTXfpttrx72ikCoVtrrAAwgdXBk9iazxxtpskfhs1O86aHXXpAEcA7ivJGDBDcDnyAsA2FMsi1KB/0bVv/EBBBSY9mZ7PAsAAAAASUVORK5CYII=);
-}
-
-#login-buttons-image-github {
-    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wJGBYxHYxl31wAAAHpSURBVDjLpZI/aFNRFMZ/973bJqGRPopV4qNq/+SpTYnWRhCKilShg9BGcHOM+GfQoZuLk4iLgw4qZNBaHLuIdBNHl7Ta1qdNFI3SihnaNG1MpH3vuiQYQnwZvHCG893zffc751z4z6PX5T5gA1DAKnAaOAQEgAfAVeCpl+CeCrlRuEC6maO4h0A1wl4tPAHMqNUthvrDdHYY7A3t4rDVjeO6rBU2FaABM1WCrBNoi48Mi+nH9yj+KtPibAKwJXfQ5vcRG7soUnYmWEuQgAEIYBv4cGpoILI0Z4tyYYPegS6UguyijZQ6J45GSNmZHzUcJYD2ii2Ajv7efZ8WZ6ZwXFj79hXpayW4O0SL1Nl/8jzZlZ9dQLFS70pgvZKIyGD0yvu5eRmMnrk1PjI81ir1qBACTdPevXj95mVuNX8XKDQc/+T334bZZ104cvzYw2s3J3qAL5WXSsDbf61NNMBu+wOBs+VSyQ84Nfhg028ZGx3/qyy0lC7lgi7lghBitoon03lvB8l0/k7Wnk+8mny0cyXzEcfZxgwfZPTyRMHsOzAFXE9YhtNQIJnOx4FpJXT1eSkn2g0frqMoFrfoCXcqlCOAGwnLuO/l4JymcWl5uRxzXUKghBAiZ5r+WaV4lrCM555zqO+x2d0ftGmpiA/0k70AAAAASUVORK5CYII=);
-}
diff --git a/packages/accounts-ui-unstyled/login_buttons_single.js b/packages/accounts-ui-unstyled/login_buttons_single.js
index 4c33ab5146..b8c0ca669f 100644
--- a/packages/accounts-ui-unstyled/login_buttons_single.js
+++ b/packages/accounts-ui-unstyled/login_buttons_single.js
@@ -23,6 +23,8 @@
       var options = {}; // use default scope unless specified
       if (Accounts.ui._options.requestPermissions[serviceName])
         options.requestPermissions = Accounts.ui._options.requestPermissions[serviceName];
+      if (Accounts.ui._options.requestOfflineToken[serviceName])
+        options.requestOfflineToken = Accounts.ui._options.requestOfflineToken[serviceName];
 
       loginWithService(options, callback);
     }
diff --git a/packages/accounts-ui-unstyled/package.js b/packages/accounts-ui-unstyled/package.js
index ef41ac3bf0..66c3997f80 100644
--- a/packages/accounts-ui-unstyled/package.js
+++ b/packages/accounts-ui-unstyled/package.js
@@ -8,7 +8,6 @@ Package.on_use(function (api) {
   api.add_files([
     'accounts_ui.js',
 
-    'login_buttons_images.css',
     'login_buttons.html',
     'login_buttons_single.html',
     'login_buttons_dropdown.html',
diff --git a/packages/accounts-ui/login_buttons.less b/packages/accounts-ui/login_buttons.less
index e6053c83e1..5b7add3db6 100644
--- a/packages/accounts-ui/login_buttons.less
+++ b/packages/accounts-ui/login_buttons.less
@@ -372,7 +372,7 @@
   width: @configure-login-service-dialog-width;
   margin-left: -(@configure-login-service-dialog-width
                + @meteor-accounts-base-padding) / 2;
-  margin-top: -180px; /* = approximately -height/2, though height can change */
+  margin-top: -220px; /* = approximately -height/2, though height can change */
 
   table { width: 100%; }
   input {
diff --git a/packages/accounts-ui/package.js b/packages/accounts-ui/package.js
index 4557c75bb2..93680b7c15 100644
--- a/packages/accounts-ui/package.js
+++ b/packages/accounts-ui/package.js
@@ -4,7 +4,7 @@ Package.describe({
 
 Package.on_use(function (api) {
   api.use('accounts-ui-unstyled', 'client');
-  api.use('less', 'server');
+  api.use('less', 'client');
 
   api.add_files(['login_buttons.less'], 'client');
 });
diff --git a/packages/accounts-weibo/package.js b/packages/accounts-weibo/package.js
index c178954131..ddb17ea9f7 100644
--- a/packages/accounts-weibo/package.js
+++ b/packages/accounts-weibo/package.js
@@ -9,7 +9,7 @@ Package.on_use(function(api) {
   api.use('templating', 'client');
 
   api.add_files(
-    ['weibo_configure.html', 'weibo_configure.js'],
+    ['weibo_login_button.css', 'weibo_configure.html', 'weibo_configure.js'],
     'client');
 
   api.add_files('weibo_common.js', ['client', 'server']);
diff --git a/packages/accounts-weibo/weibo_client.js b/packages/accounts-weibo/weibo_client.js
index 7f2aea042f..a4b5258383 100644
--- a/packages/accounts-weibo/weibo_client.js
+++ b/packages/accounts-weibo/weibo_client.js
@@ -24,5 +24,4 @@
 
     Accounts.oauth.initiateLogin(state, loginUrl, callback);
   };
-
 }) ();
diff --git a/packages/accounts-weibo/weibo_login_button.css b/packages/accounts-weibo/weibo_login_button.css
new file mode 100644
index 0000000000..fe3188ef80
--- /dev/null
+++ b/packages/accounts-weibo/weibo_login_button.css
@@ -0,0 +1,3 @@
+#login-buttons-image-weibo {
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAKySURBVDhPY2AgEpR5sjf/nS/6//UkoX+XJltuCvVxkcOp9cyZM1w/r13TuXvmDD9MkYIwg7qrNrubnzFb6J5intPHqrnvCnIwyKIYsmrVKuaFYWEFW2Sk79zX0f6/REHhKFABC0zRsky+rXMSeZdKCTLIHqgUvLAknW8L3IAQDw/RFlbWnQ801P+DNN8D4n0qyk94GRiEjTg5Lbz4+YOCdbhjVmTxbZwex7PUW58t8O1Ukf9gA2IDAoRPWFudfayt9f+mpsb/6yrK/28qKf4/ISf7YZu83K07QMNe6On9nyWusMtVm813azH/UWctZo/vc8TABjB3CApufAzSqKjw/7apyf+nMdH/XxUX/X+RnfX/qY/3/5tqqv/vq6v936KsfB2onltaiEHGx5AteFep4EmGUEHB1Adamv9v6er8fztp0v//79////nr1/+3X778B4N///5/O3jw/0N39//nlBQ/louLd4MMAWImcPhsU1G6DfLvt717wepnz537X0FB4T8fL+//AH///2/evgWL/7l///9dE+P/b4AWTZSWXg/UzAj2/w2gs59mZYEV7d+//z8rE9N/JUXF/w62tiD//a+urIS4BAgeA712Cxg2F40M36alpXGBDTgmI/3hdUU5WEFjff3/wvx8MNvcxARsQE1VFUQ30Et37Oz+P1RV+b/J0nIjUATigmgBvtzH5mb//9++/f/mkyf/A4KC/nv7+oI1W1hb/3/1+fP//9+//39ekP//CVDzTlnZxxtnz1ZBSUDeDAyZh7W13nybOeP/7W1b/09rbf2/FhgWHy9c+P912bL/D11d/l+WEP8/SUR4Ox8DA6pmmEkpHh4ya0JCim4lJGx7kZp8821CwrN7Hh4Pr7m6nDoSET61PjDQichsA3T7//+s/16/5gXSkIAa1AAAh8dhOVd5xHAAAAAASUVORK5CYII=);
+}
diff --git a/packages/domutils/domutils.js b/packages/domutils/domutils.js
index f9549dc7a6..8c48ab10d2 100644
--- a/packages/domutils/domutils.js
+++ b/packages/domutils/domutils.js
@@ -43,6 +43,11 @@ DomUtils = {};
 
   var testDiv = document.createElement("div");
   testDiv.innerHTML = "   <link/><table></table><select><!----></select>";
+  // Need to wrap in a div rather than directly creating SELECT to avoid
+  // *another* IE bug.
+  var testSelectDiv = document.createElement("div");
+  testSelectDiv.innerHTML = "<select><option selected>Foo</option></select>";
+  testSelectDiv.firstChild.setAttribute("name", "myname");
 
   // Tests that, if true, indicate browser quirks present.
   var quirks = {
@@ -55,10 +60,16 @@ DomUtils = {};
     // IE loses some tags in some environments (requiring extra wrapper).
     tagsLost: testDiv.getElementsByTagName("link").length === 0,
 
-    // IE <= 8 loses HTML comments in <select> and <option> tags.
-    // Assert that we have IE's mergeAttributes to use in our work-around.
-    commentsLost: ((! testDiv.getElementsByTagName("select")[0].firstChild)
-                   && testDiv.mergeAttributes)
+    // IE <= 9 loses HTML comments in <select> and <option> tags.
+    commentsLost: (! testDiv.getElementsByTagName("select")[0].firstChild),
+
+    selectValueMustBeFromAttribute: (testSelectDiv.firstChild.value !== "Foo"),
+
+    // In IE7, setAttribute('name', foo) doesn't show up in rendered HTML.
+    // (In FF3, outerHTML is undefined, but it doesn't have this quirk.)
+    mustSetNameInCreateElement: (
+      testSelectDiv.firstChild.outerHTML &&
+        testSelectDiv.firstChild.outerHTML.indexOf("myname") === -1)
   };
 
   // Set up map of wrappers for different nodes.
@@ -157,15 +168,41 @@ DomUtils = {};
         // the DOM.
         // Here we build an array of fake tags and iterate over that.
         _.each(container.getElementsByTagName("ins"), function (ins) {
-          if (ins.getAttribute("domutilsrealtagname"))
+          if (ins.getAttribute("domutilsrealtagname")) {
             fakeTags.push(ins);
+          }
         });
+
         _.each(fakeTags, function (fakeTag) {
-          var realTag = document.createElement(
-            fakeTag.getAttribute('domutilsrealtagname'));
+          var tagName = fakeTag.getAttribute('domutilsrealtagname');
+          if (quirks.mustSetNameInCreateElement &&
+              fakeTag.getAttribute('name')) {
+            // IE7 can't set 'name' with setAttribute, but it has this
+            // crazy syntax for setting it at create time.
+            // http://webbugtrack.blogspot.com/2007/10/bug-235-createelement-is-broken-in-ie.html
+            // http://msdn.microsoft.com/en-us/library/ms536389.aspx
+            tagName = "<" + tagName + " name='" +
+              _.escape(fakeTag.getAttribute('name')) + "'/>";
+          }
+          var realTag = document.createElement(tagName);
           fakeTag.removeAttribute('domutilsrealtagname');
-          // copy all attributes
-          realTag.mergeAttributes(fakeTag, false);
+          // copy all attributes. for some reason mergeAttributes doesn't work
+          // here: eg, it doesn't copy SELECTED or VALUE. (Probably because
+          // these attributes would be expando on INS?)
+          var fakeAttrs = fakeTag.attributes;
+          for (var i = 0; i < fakeAttrs.length; ++i) {
+            var fakeAttr = fakeAttrs.item(i);
+            if (fakeAttr.specified) {
+              var name = fakeAttr.name.toLowerCase();
+              var value = String(fakeAttr.value);
+              // IE7 gets confused if you try to setAttribute('selected', ''),
+              // so be a little more explicit.
+              if (name === 'selected' && value === '')
+                value = 'selected';
+              realTag.setAttribute(name, value);
+            }
+          }
+
           // move all children
           while (fakeTag.firstChild)
             realTag.appendChild(fakeTag.firstChild);
@@ -480,5 +517,44 @@ DomUtils = {};
     return DomUtils.rangeToHtml(node, node);
   };
 
+  // Sets the value of an element, portably across browsers. There's a special
+  // case for SELECT elements in IE.
+  DomUtils.setElementValue = function (node, value) {
+    // Try to assign the value.
+    node.value = value;
+    if (node.value === value || node.nodeName !== 'SELECT')
+      return;
+
+    // IE (all versions) appears to only let you assign SELECT values which
+    // match valid OPTION values... and moreover, the OPTION value must be
+    // explicitly given as an attribute, not just as the text. So we hunt for
+    // the OPTION and select it.
+    var options = DomUtils.findAll(node, 'option');
+    for (var i = 0; i < options.length; ++i) {
+      if (DomUtils.getElementValue(options[i]) === value) {
+        options[i].selected = true;
+        return;
+      }
+    }
+  };
+
+  // Gets the value of an element, portably across browsers. There's a special
+  // case for SELECT elements in IE.
+  DomUtils.getElementValue = function (node) {
+    if (!quirks.selectValueMustBeFromAttribute)
+      return node.value;
+
+    if (node.nodeName === 'OPTION') {
+      // Inspired by jQuery.valHooks.option.get.
+      var val = node.attributes.value;
+      return !val || val.specified ? node.value : node.text;
+    } else if (node.nodeName === 'SELECT') {
+      if (node.selectedIndex < 0)
+        return null;
+      return DomUtils.getElementValue(node.options[node.selectedIndex]);
+    } else {
+      return node.value;
+    }
+  };
 
 })();
diff --git a/packages/domutils/domutils_tests.js b/packages/domutils/domutils_tests.js
index 07beb7ed69..504c95e5f1 100644
--- a/packages/domutils/domutils_tests.js
+++ b/packages/domutils/domutils_tests.js
@@ -1 +1,13 @@
-// TESTS GO HERE
\ No newline at end of file
+Tinytest.add("domutils - setElementValue", function (test) {
+  var div = OnscreenDiv();
+  div.node().appendChild(DomUtils.htmlToFragment(
+    ("<select><option>Foo</option><option value='Bar'>Baz</option>" +
+     "<option selected value='Quux'>Quux</option></select>")));
+
+  var select = DomUtils.find(div.node(), 'select');
+  test.equal(DomUtils.getElementValue(select), "Quux");
+  _.each(["Foo", "Bar", "Quux"], function (value) {
+    DomUtils.setElementValue(select, value);
+    test.equal(DomUtils.getElementValue(select), value);
+  });
+});
diff --git a/packages/http/httpcall_client.js b/packages/http/httpcall_client.js
index f8b3421868..be47ac9a0d 100644
--- a/packages/http/httpcall_client.js
+++ b/packages/http/httpcall_client.js
@@ -20,9 +20,13 @@ Meteor.http = Meteor.http || {};
 
     method = (method || "").toUpperCase();
 
+    var headers = {};
+
     var content = options.content;
-    if (options.data)
+    if (options.data) {
       content = JSON.stringify(options.data);
+      headers['Content-Type'] = 'application/json';
+    }
 
     var params_for_url, params_for_body;
     if (content || method === "GET" || method === "HEAD")
@@ -51,6 +55,8 @@ Meteor.http = Meteor.http || {};
       content = Meteor.http._encodeParams(params_for_body);
     }
 
+    _.extend(headers, options.headers || {});
+
     ////////// Callback wrapping //////////
 
     // wrap callback to always return a result object, and always
@@ -84,9 +90,8 @@ Meteor.http = Meteor.http || {};
 
       xhr.open(method, url, true, username, password);
 
-      if (options.headers)
-        for (var k in options.headers)
-          xhr.setRequestHeader(k, options.headers[k]);
+      for (var k in headers)
+        xhr.setRequestHeader(k, headers[k]);
 
 
       // setup timeout
diff --git a/packages/http/httpcall_common.js b/packages/http/httpcall_common.js
index 101e8028f8..91774992ae 100644
--- a/packages/http/httpcall_common.js
+++ b/packages/http/httpcall_common.js
@@ -8,11 +8,16 @@ Meteor.http = Meteor.http || {};
     _.each(params, function(value, key) {
       if (buf.length)
         buf.push('&');
-      buf.push(encodeURIComponent(key), '=', encodeURIComponent(value));
+      buf.push(Meteor.http._encodeString(key), '=',
+               Meteor.http._encodeString(value));
     });
     return buf.join('').replace(/%20/g, '+');
   };
 
+  Meteor.http._encodeString = function(str) {
+    return encodeURIComponent(str).replace(/[!'()]/g, escape).replace(/\*/g, "%2A");
+  };
+
   Meteor.http._buildUrl = function(before_qmark, from_qmark, opt_query, opt_params) {
     var url_without_query = before_qmark;
     var query = from_qmark ? from_qmark.slice(1) : null;
diff --git a/packages/http/httpcall_server.js b/packages/http/httpcall_server.js
index a3011f70f6..14d74e8dff 100644
--- a/packages/http/httpcall_server.js
+++ b/packages/http/httpcall_server.js
@@ -27,9 +27,13 @@ Meteor.http = Meteor.http || {};
 
     var url_parts = url_util.parse(url);
 
+    var headers = {};
+
     var content = options.content;
-    if (options.data)
+    if (options.data) {
       content = JSON.stringify(options.data);
+      headers['Content-Type'] = 'application/json';
+    }
 
 
     var params_for_url, params_for_body;
@@ -42,9 +46,6 @@ Meteor.http = Meteor.http || {};
       url_parts.protocol+"//"+url_parts.host+url_parts.pathname,
       url_parts.search, options.query, params_for_url);
 
-
-    var headers = {};
-
     if (options.auth) {
       if (options.auth.indexOf(':') < 0)
         throw new Error('auth option should be of the form "username:password"');
diff --git a/packages/http/httpcall_tests.js b/packages/http/httpcall_tests.js
index edd0a29fbd..55348f075f 100644
--- a/packages/http/httpcall_tests.js
+++ b/packages/http/httpcall_tests.js
@@ -222,6 +222,22 @@ testAsyncMulti("httpcall - methods", [
         test.equal(result.statusCode, 200);
         var data = result.data;
         test.equal(data.body, {greeting: "Hello World!"});
+        // nb: some browsers include a charset here too.
+        test.matches(data.headers['content-type'], /^application\/json\b/);
+      }));
+
+    Meteor.http.call(
+      "POST", url_prefix()+"/data-test-explicit",
+      { data: {greeting: "Hello World!"},
+        headers: {'Content-Type': 'text/stupid'} },
+      expect(function(error, result) {
+        test.isFalse(error);
+        test.isTrue(result);
+        test.equal(result.statusCode, 200);
+        var data = result.data;
+        test.equal(data.body, {greeting: "Hello World!"});
+        // nb: some browsers include a charset here too.
+        test.matches(data.headers['content-type'], /^text\/stupid\b/);
       }));
   }
 ]);
@@ -294,7 +310,6 @@ testAsyncMulti("httpcall - headers", [
 
 testAsyncMulti("httpcall - params", [
   function(test, expect) {
-
     var do_test = function(method, url, params, opt_opts, expect_url, expect_body) {
       var opts = {};
       if (typeof opt_opts === "string") {
@@ -324,6 +339,8 @@ testAsyncMulti("httpcall - params", [
     do_test("GET", "/", {foo:"bar", fruit:"apple"}, "/?foo=bar&fruit=apple", "");
     do_test("POST", "/", {foo:"bar", fruit:"apple"}, "/", "foo=bar&fruit=apple");
     do_test("POST", "/", {foo:"bar", fruit:"apple"}, "/", "foo=bar&fruit=apple");
+    do_test("GET", "/", {'foo!':"bang!"}, {}, "/?foo%21=bang%21", "");
+    do_test("POST", "/", {'foo!':"bang!"}, {}, "/", "foo%21=bang%21");
     do_test("POST", "/", {foo:"bar", fruit:"apple"}, {
       content: "stuff!"}, "/?foo=bar&fruit=apple", "stuff!");
     do_test("POST", "/", {foo:"bar", greeting:"Hello World"}, {
diff --git a/packages/jsparse/lexer.js b/packages/jsparse/lexer.js
index 95cef2d179..9e762f6c78 100644
--- a/packages/jsparse/lexer.js
+++ b/packages/jsparse/lexer.js
@@ -70,10 +70,10 @@ var rPunctuator = new RegExp(
     .join('|'), 'g');
 var rDivPunctuator = /\/=?/g;
 // Section 7.8.3
-var rHexLiteral = /0x[0-9a-fA-F]+$/g;
-var rOctLiteral = /0[0-7]+/g; // deprecated
+var rHexLiteral = /0[xX][0-9a-fA-F]+(?!\w)/g;
+var rOctLiteral = /0[0-7]+(?!\w)/g; // deprecated
 var rDecLiteral =
-      /(((0|[1-9][0-9]*)(\.[0-9]*)?)|\.[0-9]+)([Ee][+-]?[0-9]+)?/g;
+      /(((0|[1-9][0-9]*)(\.[0-9]*)?)|\.[0-9]+)([Ee][+-]?[0-9]+)?(?!\w)/g;
 // Section 7.8.4
 var rStringQuote = /["']/g;
 // Match one or more characters besides quotes, backslashes, or line ends
@@ -81,14 +81,30 @@ var rStringMiddle = /(?=.)[^"'\\]+?((?!.)|(?=["'\\]))/g;
 // Match one escape sequence, including the backslash.
 var rEscapeSequence =
       /\\(['"\\bfnrtv]|0(?![0-9])|x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|(?=.)[^ux0-9])/g;
+// Match one ES5 line continuation
+var rLineContinuation =
+      /\\(\r\n|[\u000A\u000D\u2028\u2029])/g;
 // Section 7.8.5
 // Match one regex literal, including slashes, not including flags.
-// XXX Add support for unescaped '/' in character class, allowed by 5th ed.
-var rRegexLiteral = /\/(?![*\/])(\\.|(?=.)[^\\])+?\//g;
+// Support unescaped '/' in character classes, per 5th ed.
+// For example: `/[/]/` will match the string `"/"`.
+//
+// Explanation of regex:
+// - Match `/` not followed by `/` or `*`
+// - Match one or more of any of these:
+//   - Backslash followed by one non-newline
+//   - One non-newline, not `[` or `\` or `/`
+//   - A character class, beginning with `[` and ending with `]`.
+//     In the middle is zero or more of any of these:
+//     - Backslash followed by one non-newline
+//     - One non-newline, not `]` or `\`
+// - Match closing `/`
+var rRegexLiteral =
+      /\/(?![*\/])(\\.|(?=.)[^\[\/\\]|\[(\\.|(?=.)[^\]\\])*\])+\//g;
 var rRegexFlags = /[a-zA-Z]*/g;
 
 var rDecider =
-      /((?=.)\s)|(\/[\/\*]?)|([\][{}().;,<>=!+*%&|^~?:-])|(\d)|(["'])|(.)|([\S\s])/g;
+      /((?=.)\s)|(\/[\/\*]?)|([\][{}();,<>=!+*%&|^~?:-]|\.(?![0-9]))|([\d.])|(["'])|(.)|([\S\s])/g;
 
 var keywordLookup = {
   ' break': 'KEYWORD',
@@ -376,7 +392,8 @@ JSLexer.prototype.next = function () {
     run(rStringQuote);
     var quote = match[0];
     do {
-      run(rStringMiddle) || run(rEscapeSequence) || run(rStringQuote);
+      run(rStringMiddle) || run(rEscapeSequence) ||
+        run(rLineContinuation) || run(rStringQuote);
     } while (match && match[0] !== quote);
     if (! (match && match[0] === quote))
       return lexeme('ERROR');
@@ -388,12 +405,21 @@ JSLexer.prototype.next = function () {
   }
   // dot (any non-line-terminator)
   run(rIdentifierPrefix);
-  // Use non-short-circuiting OR, '|', to allow matching
+  // Use non-short-circuiting bitwise OR, '|', to always try
   // both regexes in sequence, returning false only if neither
   // matched.
-  while (run(rIdentifierMiddle) | run(rIdentifierPrefix)) {/*continue*/}
+  while ((!! run(rIdentifierMiddle)) |
+         (!! run(rIdentifierPrefix))) { /*continue*/ }
   var word = code.substring(origPos, pos);
   return lexeme(keywordLookup[' '+word] || 'IDENTIFIER');
 };
 
+JSLexer.prettyOffset = function (code, pos) {
+  var codeUpToPos = code.substring(0, pos);
+  var startOfLine = codeUpToPos.lastIndexOf('\n') + 1;
+  var indexInLine = pos - startOfLine; // 0-based
+  var lineNum = codeUpToPos.replace(/[^\n]+/g, '').length + 1; // 1-based
+  return "line " + lineNum + ", offset " + indexInLine;
+};
+
 })();
diff --git a/packages/jsparse/parser.js b/packages/jsparse/parser.js
index 9aace70cc1..99630a3827 100644
--- a/packages/jsparse/parser.js
+++ b/packages/jsparse/parser.js
@@ -70,7 +70,8 @@ JSParser.prototype.consumeNewToken = function () {
   do {
     lex = lexer.next();
     if (lex.isError())
-      throw new Error("Bad token at position " + lex.startPos() +
+      throw new Error("Bad token at " +
+                      JSLexer.prettyOffset(lexer.code, lex.startPos()) +
                       ", text `" + lex.text() + "`");
     else if (lex.type() === "NEWLINE")
       self.isLineTerminatorHere = true;
@@ -89,7 +90,7 @@ JSParser.prototype.getParseError = function (expecting, found) {
   if (this.oldToken)
     msg += " after " + this.oldToken;
   var pos = this.pos;
-  msg += " at position " + pos;
+  msg += " at " + JSLexer.prettyOffset(this.lexer.code, pos);
   msg += ", found " + (found || this.newToken);
   return new Error(msg);
 };
@@ -233,21 +234,42 @@ JSParser.prototype.getSyntaxTree = function () {
                      list(token(',')))),
                  token(']')));
 
+  // "IdentifierName" in ES5 allows reserved words, like in a property access
+  // or a key of an object literal.
+  // Put IDENTIFIER last so it shows up in the error message.
+  var identifierName = or(tokenType('NULL'), tokenType('BOOLEAN'),
+                          tokenType('KEYWORD'), tokenType('IDENTIFIER'));
+
   var propertyName = expecting('propertyName', or(
-    node('idPropName', tokenType('IDENTIFIER')),
+    node('idPropName', identifierName),
     node('numPropName', tokenType('NUMBER')),
     node('strPropName', tokenType('STRING'))));
   var nameColonValue = expecting(
     'propertyName',
     node('prop', seq(propertyName, token(':'), assignmentExpression)));
 
+  // Allow trailing comma in object literal, per ES5.  Trailing comma
+  // must follow a `name:value`, that is, `{,}` is invalid.
+  //
+  // We can't just use a normal comma list(), because it will seize
+  // on the comma as a sign that the list continues.  Instead,
+  // we specify a list of either ',' or nameColonValue, using positive
+  // and negative lookAheads to constrain the sequence.  The grammar
+  // is ordered so that error messages will always say
+  // "Expected propertyName" or "Expected ," as appropriate, not
+  // "Expected ," when the look-ahead is negative or "Expected }".
   var objectLiteral =
         node('object',
              seq(token('{'),
                  or(lookAheadToken('}'),
-                    list(nameColonValue,
-                         token(','))),
-                 token('}')));
+                    and(not(lookAheadToken(',')),
+                        list(or(seq(token(','),
+                                    expecting('propertyName',
+                                              not(lookAheadToken(',')))),
+                                seq(nameColonValue,
+                                    or(lookAheadToken('}'),
+                                       lookAheadToken(','))))))),
+                 expecting('propertyName', token('}'))));
 
   var functionMaybeNameRequired = booleanFlaggedParser(
     function (nameRequired) {
@@ -281,7 +303,8 @@ JSParser.prototype.getSyntaxTree = function () {
                      objectLiteral,
                      functionExpression));
 
-  var dotEnding = seq(token('.'), tokenType('IDENTIFIER'));
+
+  var dotEnding = seq(token('.'), identifierName);
   var bracketEnding = seq(token('['), expression, token(']'));
   var callArgs = seq(token('('),
                      or(lookAheadToken(')'),
diff --git a/packages/jsparse/parser_tests.js b/packages/jsparse/parser_tests.js
index d8c67ae789..67debaeb14 100644
--- a/packages/jsparse/parser_tests.js
+++ b/packages/jsparse/parser_tests.js
@@ -141,7 +141,8 @@ var makeTester = function (test) {
     // assert that a tokenization error occurred at '@'.
     badToken: function (code) {
       var constructMessage = function (pos, text) {
-        return "Bad token at position " + pos + ", text `" + text + "`";
+        var nicePos = JSLexer.prettyOffset(code, pos);
+        return "Bad token at " + nicePos + ", text `" + text + "`";
       };
       var pos = code.indexOf('`');
       var text = code.match(/`(.*?)`/)[1];
@@ -176,7 +177,7 @@ var makeTester = function (test) {
     badParse: function (code) {
       var constructMessage = function (whatExpected, pos, found, after) {
         return "Expected " + whatExpected + (after ? " after " + after : "") +
-          " at position " + pos + ", found " + found;
+          " at " + JSLexer.prettyOffset(code, pos) + ", found " + found;
       };
       var pos = code.indexOf('`');
 
@@ -200,7 +201,8 @@ var makeTester = function (test) {
         var after = parser.oldToken;
         found = (found || parser.newToken);
         test.equal(error.message,
-                   constructMessage(whatExpected, pos, found, after));
+                   constructMessage(whatExpected, pos, found, after),
+                   code);
       }
     }
   };
@@ -240,6 +242,10 @@ Tinytest.add("jsparse - tokenization errors", function (test) {
   var tester = makeTester(test);
   tester.badToken("123`@`");
   tester.badToken("thisIsATestOf = `'unterminated `\n strings'");
+  // make sure newlines aren't quietly included in regex literals
+  tester.badToken("var x = `/`a\nb/;");
+  tester.badToken("var x = `/`a\\\nb/;");
+  tester.badToken("var x = `/`a[\n]b/;");
 });
 
 Tinytest.add("jsparse - syntax forms", function (test) {
@@ -395,6 +401,20 @@ Tinytest.add("jsparse - syntax forms", function (test) {
     ["null + this - 3 + true",
      "program(expressionStmnt(binary(binary(binary(null(null) + this(this)) - " +
      "number(3)) + boolean(true)) ;()))"],
+    ["+.5",
+     "program(expressionStmnt(unary(+ number(.5)) ;()))"],
+    ["a1a1a",
+     "program(expressionStmnt(identifier(a1a1a) ;()))"],
+    ["/abc/mig",
+     "program(expressionStmnt(regex(/abc/mig) ;()))"],
+    ["/[]/",
+     "program(expressionStmnt(regex(/[]/) ;()))"],
+    ["/[/]/",
+     "program(expressionStmnt(regex(/[/]/) ;()))"],
+    ["/[[/]/",
+     "program(expressionStmnt(regex(/[[/]/) ;()))"],
+    ["/.\\/[a//b]\\[\\][[\\d/]/",
+     "program(expressionStmnt(regex(/.\\/[a//b]\\[\\][[\\d/]/) ;()))"],
     ["a / /b/mgi / c",
      "program(expressionStmnt(binary(binary(identifier(a) / " +
      "regex(/b/mgi)) / identifier(c)) ;()))"],
@@ -549,7 +569,36 @@ Tinytest.add("jsparse - syntax forms", function (test) {
     // comments don't interfere with parse
     ["if (true)\n//comment\nfoo();",
      "program(ifStmnt(if `(` boolean(true) `)` " +
-     "expressionStmnt(call(identifier(foo) `(` `)`) ;)))"]
+     "expressionStmnt(call(identifier(foo) `(` `)`) ;)))"],
+    // bare keywords allowed in property access and object literal
+    ["foo.return();",
+     "program(expressionStmnt(call(dot(identifier(foo) . return) `(` `)`) ;))"],
+    ["foo.true();",
+     "program(expressionStmnt(call(dot(identifier(foo) . true) `(` `)`) ;))"],
+    ["foo.null();",
+     "program(expressionStmnt(call(dot(identifier(foo) . null) `(` `)`) ;))"],
+    ["({true:3})",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(true) : number(3)) }) `)`) ;()))"],
+    ["({null:3})",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(null) : number(3)) }) `)`) ;()))"],
+    ["({if:3})",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(if) : number(3)) }) `)`) ;()))"],
+    // ES5 line continuations in string literals
+    ["var x = 'a\\\nb\\\nc';",
+     "program(varStmnt(var varDecl(x = string(`'a\\\nb\\\nc'`)) ;))"],
+    // ES5 trailing comma in object literal
+    ["({});",
+     "program(expressionStmnt(parens(`(` object({ }) `)`) ;))"],
+    ["({x:1});",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(x) : number(1)) }) `)`) ;))"],
+    ["({x:1,});",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(x) : number(1)) , }) `)`) ;))"],
+    ["({x:1,y:2});",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(x) : number(1)) , " +
+     "prop(idPropName(y) : number(2)) }) `)`) ;))"],
+    ["({x:1,y:2,});",
+     "program(expressionStmnt(parens(`(` object({ prop(idPropName(x) : number(1)) , " +
+     "prop(idPropName(y) : number(2)) , }) `)`) ;))"]
   ];
   _.each(trials, function (tr) {
     tester.goodParse(tr[0], tr[1]);
@@ -558,6 +607,8 @@ Tinytest.add("jsparse - syntax forms", function (test) {
 
 Tinytest.add("jsparse - bad parses", function (test) {
   var tester = makeTester(test);
+  // string between backticks is pulled out and becomes what's "expected"
+  // at that location, according to the correct error message
   var trials = [
     '{`statement`',
     'if (`expression`)',
@@ -590,16 +641,29 @@ Tinytest.add("jsparse - bad parses", function (test) {
     'foo: `statement`function foo() {}',
     '[`expression`=',
     '[,,`expression`=',
-    '({`propertyName`true:3})',
+    '({`propertyName`|:3})',
     '({1:2,3`:`})',
     '({1:2,`propertyName`',
-    'x.`IDENTIFIER`true',
+    'x.`IDENTIFIER`,',
     'foo;`semicolon`:;',
     '1;`statement`=',
     'a+b`semicolon`=c;',
     'for(1+1 `semicolon`in {});',
     '`statement`=',
-    'for(;`expression`var;) {}'
+    'for(;`expression`var;) {}',
+    '({`propertyName`',
+    '({`propertyName`,})',
+    '({`propertyName`:})',
+    '({x`:`})',
+    '({x:1,`propertyName`',
+    '({x:1,`propertyName`,})',
+    '({x:1`,`',
+    '({x:1,`propertyName`,y:2})',
+    '({x:1,`propertyName`,})',
+    '({x:1,y:2`,`:',
+    '({x:1,y:2,`propertyName`',
+    '({x:1,y:2,`propertyName`:',
+    '({x:1,y:2,`propertyName`,})'
   ];
   _.each(trials, function (tr) {
     tester.badParse(tr);
diff --git a/packages/livedata/client_convenience.js b/packages/livedata/client_convenience.js
index 01da0011f5..ee435ac86e 100644
--- a/packages/livedata/client_convenience.js
+++ b/packages/livedata/client_convenience.js
@@ -1,14 +1,14 @@
 (function () {
   // By default, try to connect back to the same endpoint as the page
   // was served from.
-  var ddp_endpoint = '/';
-  if (typeof __meteor_runtime_config__ !== "undefined" &&
-      __meteor_runtime_config__.DEFAULT_DDP_ENDPOINT)
-    ddp_endpoint = __meteor_runtime_config__.DEFAULT_DDP_ENDPOINT;
+  var ddpUrl = '/';
+  if (typeof __meteor_runtime_config__ !== "undefined") {
+    if (__meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL)
+      ddpUrl = __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL;
+  }
 
   _.extend(Meteor, {
-    default_connection: Meteor.connect(ddp_endpoint,
-                                       true /* restart_on_update */),
+    default_connection: Meteor.connect(ddpUrl, true /* restart_on_update */),
 
     refresh: function (notification) {
     }
diff --git a/packages/livedata/livedata_connection.js b/packages/livedata/livedata_connection.js
index 7b57ff7245..dd0644a2ef 100644
--- a/packages/livedata/livedata_connection.js
+++ b/packages/livedata/livedata_connection.js
@@ -9,8 +9,8 @@ if (Meteor.isServer) {
 // we can't do recursive Meteor.autosubscribe().
 var captureSubs = null;
 
-// @param url {String|Object} URL to Meteor app or sockjs endpoint (deprecated),
-//     or an object as a test hook (see code)
+// @param url {String|Object} URL to Meteor app,
+//   or an object as a test hook (see code)
 // Options:
 //   reloadOnUpdate: should we try to reload when the server says
 //                      there's new code available?
@@ -30,9 +30,6 @@ Meteor._LivedataConnection = function (url, options) {
   // as a test hook, allow passing a stream instead of a url.
   if (typeof url === "object") {
     self._stream = url;
-    // if we have two test streams, auto reload stuff will break because
-    // the url is used as a key for the migration data.
-    url = "/debug";
   } else {
     self._stream = new Meteor._Stream(url);
   }
@@ -217,6 +214,12 @@ Meteor._LivedataConnection = function (url, options) {
       self._outstandingMethodBlocks.shift();
     }
 
+    // Mark all messages as unsent, they have not yet been sent on this
+    // connection.
+    _.each(self._methodInvokers, function (m) {
+      m.sentMessage = false;
+    });
+
     // If an `onReconnect` handler is set, call it first. Go through
     // some hoops to ensure that methods that are called from within
     // `onReconnect` get executed _before_ ones that were originally
@@ -488,7 +491,7 @@ _.extend(Meteor._LivedataConnection.prototype, {
       callback = Meteor.bindEnvironment(callback, function (e) {
         // XXX improve error message (and how we report it)
         Meteor._debug("Exception while delivering result of invoking '" +
-                      name + "'", e.stack);
+                      name + "'", e, e.stack);
       });
     }
 
@@ -1155,13 +1158,12 @@ _.extend(Meteor._LivedataConnection.prototype, {
 });
 
 _.extend(Meteor, {
-  // @param url {String} URL to Meteor app, or to sockjs endpoint (deprecated),
+  // @param url {String} URL to Meteor app,
   //     e.g.:
   //     "subdomain.meteor.com",
   //     "http://subdomain.meteor.com",
   //     "/",
-  //     "http://subdomain.meteor.com/sockjs" (deprecated),
-  //     "/sockjs" (deprecated)
+  //     "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
   connect: function (url, _reloadOnUpdate) {
     var ret = new Meteor._LivedataConnection(
       url, {reloadOnUpdate: _reloadOnUpdate});
diff --git a/packages/livedata/livedata_connection_tests.js b/packages/livedata/livedata_connection_tests.js
index 127b273c83..86c0cd3967 100644
--- a/packages/livedata/livedata_connection_tests.js
+++ b/packages/livedata/livedata_connection_tests.js
@@ -1051,6 +1051,49 @@ Tinytest.add("livedata connection - onReconnect prepends messages correctly with
   ]);
 });
 
+Tinytest.add("livedata connection - onReconnect with sent messages", function(test) {
+  var stream = new Meteor._StubStream();
+  var conn = newConnection(stream);
+  startAndConnect(test, stream);
+
+  // setup method
+  conn.methods({do_something: function (x) {}});
+
+  conn.onReconnect = function() {
+    conn.apply('do_something', ['login'], {wait: true});
+  };
+
+  conn.apply('do_something', ['one']);
+
+  // initial connect
+  stream.sent = [];
+  stream.reset();
+  testGotMessage(
+    test, stream, {msg: 'connect', session: conn._lastSessionId});
+
+  // Test that we sent just the login message.
+  var loginId = testGotMessage(
+    test, stream, {msg: 'method', method: 'do_something',
+                   params: ['login'], id: '*'});
+
+  // we connect.
+  stream.receive({msg: 'connected', session: Meteor.uuid()});
+  test.length(stream.sent, 0);
+
+  // login got result (but not yet data)
+  stream.receive({msg: 'result', id: loginId, result: 'foo'});
+  test.length(stream.sent, 0);
+
+  // login got data. now we send next method.
+  stream.receive({msg: 'data', methods: [loginId]});
+
+  testGotMessage(
+    test, stream, {msg: 'method', method: 'do_something',
+                   params: ['one'], id: '*'});
+});
+
+
+
 Tinytest.add("livedata stub - reconnect double wait method", function (test) {
   var stream = new Meteor._StubStream;
   var conn = newConnection(stream);
diff --git a/packages/livedata/server_convenience.js b/packages/livedata/server_convenience.js
index 547181ab66..0ade2e9afa 100644
--- a/packages/livedata/server_convenience.js
+++ b/packages/livedata/server_convenience.js
@@ -1,5 +1,7 @@
-if (process.env.DEFAULT_DDP_ENDPOINT)
-  __meteor_runtime_config__.DEFAULT_DDP_ENDPOINT = process.env.DEFAULT_DDP_ENDPOINT;
+if (process.env.DDP_DEFAULT_CONNECTION_URL) {
+  __meteor_runtime_config__.DDP_DEFAULT_CONNECTION_URL =
+    process.env.DDP_DEFAULT_CONNECTION_URL;
+}
 
 
 _.extend(Meteor, {
diff --git a/packages/liverange/liverange.js b/packages/liverange/liverange.js
index 5ced30c443..2e93f85939 100644
--- a/packages/liverange/liverange.js
+++ b/packages/liverange/liverange.js
@@ -15,8 +15,18 @@
     try {
       testElem.test = 123;
     } catch (exception) { }
+    if (testElem.test !== 123)
+      return false;
 
-    return (testElem.test === 123);
+    // IE9 and 10 have a weird issue with multiple text nodes next to
+    // each other losing their expando attributes. Use the same
+    // workaround as IE8. Not sure how to test this as a feature, so use
+    // browser detection instead.
+    // See https://github.com/meteor/meteor/issues/458
+    if (document.documentMode)
+      return false;
+
+    return true;
   })();
 
   var wrapEndpoints = function (start, end) {
diff --git a/packages/madewith/madewith.js b/packages/madewith/madewith.js
index 4b2c48844e..01dc7b44cf 100644
--- a/packages/madewith/madewith.js
+++ b/packages/madewith/madewith.js
@@ -19,7 +19,7 @@
 
   Template.madewith.vote_count = function() {
     var app = apps.findOne();
-    return app ? app.vote_count : '???';
+    return app ? app.vote_count : '';
   };
 
   Template.madewith.shortname = function () {
@@ -29,13 +29,13 @@
   Template.madewith.events({
     'click .madewith_upvote': function(event) {
       var app = apps.findOne();
-      if (app) {
+      if (app)
         server.call('vote', hostname);
-        // stop these so you don't click through the link to go to the
-        // app.
-        event.stopPropagation();
-        event.preventDefault();
-      }
+
+      // stop these so you don't click through the link to go to the
+      // app.
+      event.stopPropagation();
+      event.preventDefault();
     }
   });
 })();
\ No newline at end of file
diff --git a/packages/meteor/fiber_helpers.js b/packages/meteor/fiber_helpers.js
index a708eb3bc7..63fd77ec7d 100644
--- a/packages/meteor/fiber_helpers.js
+++ b/packages/meteor/fiber_helpers.js
@@ -22,7 +22,7 @@ Meteor._noYieldsAllowed = function (f) {
 };
 
 // js2-mode AST blows up when parsing 'future.return()', so alias.
-Future.prototype.ret = Future.prototype.return;
+Future.prototype.ret = Future.prototype['return'];
 
 // Meteor._SynchronousQueue is a queue which runs task functions serially.
 // Tasks are assumed to be synchronous: ie, it's assumed that they are
@@ -141,4 +141,15 @@ _.extend(Meteor._SynchronousQueue.prototype, {
   }
 });
 
+// Sleep. Mostly used for debugging (eg, inserting latency into server
+// methods).
+Meteor._sleepForMs = function (ms) {
+  var fiber = Fiber.current;
+  setTimeout(function() {
+    fiber.run();
+  }, ms);
+  Fiber.yield();
+};
+
+
 })();
diff --git a/packages/meteor/server_environment.js b/packages/meteor/server_environment.js
index 57516f3e90..62313947bc 100644
--- a/packages/meteor/server_environment.js
+++ b/packages/meteor/server_environment.js
@@ -2,3 +2,12 @@ Meteor = {
   isClient: false,
   isServer: true
 };
+
+try {
+  Meteor.settings = {};
+  if (process.env.METEOR_SETTINGS)
+    Meteor.settings = JSON.parse(process.env.METEOR_SETTINGS);
+} catch (e) {
+  throw new Error("Settings are not valid JSON");
+}
+
diff --git a/packages/minimongo/minimongo.js b/packages/minimongo/minimongo.js
index 91477e54df..6677e7819f 100644
--- a/packages/minimongo/minimongo.js
+++ b/packages/minimongo/minimongo.js
@@ -70,9 +70,9 @@ LocalCollection.Cursor = function (collection, selector, options) {
   } else {
     this.selector_f = LocalCollection._compileSelector(selector);
     this.sort_f = options.sort ? LocalCollection._compileSort(options.sort) : null;
-    this.skip = options.skip;
-    this.limit = options.limit;
   }
+  this.skip = options.skip;
+  this.limit = options.limit;
 
   // db_objects is a list of the objects that match the cursor. (It's always a
   // list, never an object: LocalCollection.Cursor is always ordered.)
@@ -94,10 +94,17 @@ LocalCollection.prototype.findOne = function (selector, options) {
   if (arguments.length === 0)
     selector = {};
 
-  // XXX disable limit here so that we can observe findOne() cursor,
-  // as required by markAsReactive.
-  // options = options || {};
-  // options.limit = 1;
+  // NOTE: by setting limit 1 here, we end up using very inefficient
+  // code that recomputes the whole query on each update. The upside is
+  // that when you reactively depend on a findOne you only get
+  // invalidated when the found object changes, not any object in the
+  // collection. Most findOne will be by id, which has a fast path, so
+  // this might not be a big deal. In most cases, invalidation causes
+  // the called to re-query anyway, so this should be a net performance
+  // improvement.
+  options = options || {};
+  options.limit = 1;
+
   return this.find(selector, options).fetch()[0];
 };
 
@@ -173,7 +180,6 @@ LocalCollection.LiveResultsSet = function () {};
 // initial results delivered through added callback
 // XXX maybe callbacks should take a list of objects, to expose transactions?
 // XXX maybe support field limiting (to limit what you're notified on)
-// XXX maybe support limit/skip
 
 _.extend(LocalCollection.Cursor.prototype, {
   observe: function (options) {
@@ -187,8 +193,8 @@ _.extend(LocalCollection.Cursor.prototype, {
   _observeInternal: function (ordered, options) {
     var self = this;
 
-    if (self.skip || self.limit)
-      throw new Error("cannot observe queries with skip or limit");
+    if (!ordered && (self.skip || self.limit))
+      throw new Error("must use ordered observe with skip or limit");
 
     var qid = self.collection.next_qid++;
 
@@ -254,6 +260,12 @@ LocalCollection.Cursor.prototype._getRawObjects = function (ordered) {
 
   // fast path for single ID value
   if (self.selector_id) {
+    // If you have non-zero skip and ask for a single id, you get
+    // nothing. This is so it matches the behavior of the '{_id: foo}'
+    // path.
+    if (self.skip)
+      return results;
+
     if (_.has(self.collection.docs, self.selector_id)) {
       var selectedDoc = self.collection.docs[self.selector_id];
       if (ordered)
@@ -273,6 +285,10 @@ LocalCollection.Cursor.prototype._getRawObjects = function (ordered) {
       else
         results[id] = doc;
     }
+    // Fast path for limited unsorted queries.
+    if (self.limit && !self.skip && !self.sort_f &&
+        results.length === self.limit)
+      return results;
   }
 
   if (!ordered)
@@ -334,18 +350,30 @@ LocalCollection.prototype.insert = function (doc) {
   self._saveOriginal(doc._id, undefined);
   self.docs[doc._id] = doc;
 
+  var queriesToRecompute = [];
+
   // trigger live queries that match
   for (var qid in self.queries) {
     var query = self.queries[qid];
-    if (query.selector_f(doc))
-      LocalCollection._insertInResults(query, doc);
+    if (query.selector_f(doc)) {
+      if (query.cursor.skip || query.cursor.limit)
+        queriesToRecompute.push(query);
+      else
+        LocalCollection._insertInResults(query, doc);
+    }
   }
+
+  _.each(queriesToRecompute, function (query) {
+    LocalCollection._recomputeResults(query);
+  });
 };
 
 LocalCollection.prototype.remove = function (selector) {
   var self = this;
   var remove = [];
 
+  var queriesToRecompute = [];
+
   // Avoid O(n) for "remove a single doc by ID".
   if (LocalCollection._selectorIsId(selector)) {
     if (_.has(self.docs, selector))
@@ -365,8 +393,12 @@ LocalCollection.prototype.remove = function (selector) {
     var removeId = remove[i];
     var removeDoc = self.docs[removeId];
     _.each(self.queries, function (query) {
-      if (query.selector_f(removeDoc))
-        queryRemove.push([query, removeDoc]);
+      if (query.selector_f(removeDoc)) {
+        if (query.cursor.skip || query.cursor.limit)
+          queriesToRecompute.push(query);
+        else
+          queryRemove.push([query, removeDoc]);
+      }
     });
     self._saveOriginal(removeId, removeDoc);
     delete self.docs[removeId];
@@ -376,41 +408,53 @@ LocalCollection.prototype.remove = function (selector) {
   for (var i = 0; i < queryRemove.length; i++) {
     LocalCollection._removeFromResults(queryRemove[i][0], queryRemove[i][1]);
   }
+  _.each(queriesToRecompute, function (query) {
+    LocalCollection._recomputeResults(query);
+  });
 };
 
 // XXX atomicity: if multi is true, and one modification fails, do
 // we rollback the whole operation, or what?
 LocalCollection.prototype.update = function (selector, mod, options) {
+  var self = this;
   if (!options) options = {};
 
-  var self = this;
-  var any = false;
+  if (options.upsert)
+    throw new Error("upsert not yet implemented");
+
   var selector_f = LocalCollection._compileSelector(selector);
+
+  // Save the original results of any query that we might need to
+  // _recomputeResults on, because _modifyAndNotify will mutate the objects in
+  // it. (We don't need to save the original results of paused queries because
+  // they already have a results_snapshot and we won't be diffing in
+  // _recomputeResults.)
+  var qidToOriginalResults = {};
+  _.each(self.queries, function (query, qid) {
+    if ((query.cursor.skip || query.cursor.limit) && !query.paused)
+      qidToOriginalResults[qid] = LocalCollection._deepcopy(query.results);
+  });
+  var recomputeQids = {};
+
   for (var id in self.docs) {
     var doc = self.docs[id];
     if (selector_f(doc)) {
       // XXX Should we save the original even if mod ends up being a no-op?
       self._saveOriginal(id, doc);
-      self._modifyAndNotify(doc, mod);
+      self._modifyAndNotify(doc, mod, recomputeQids);
       if (!options.multi)
-        return;
-      any = true;
+        break;
     }
   }
 
-  if (options.upsert) {
-    throw Error("upsert not yet implemented");
-    if (!any) {
-      // XXX is this actually right? don't we have to resolve/delete $-ops or
-      // something like that?
-      var insert = LocalCollection._deepcopy(selector);
-      LocalCollection._modify(insert, mod);
-      self.insert(insert);
-    }
-  }
+  _.each(recomputeQids, function (dummy, qid) {
+    LocalCollection._recomputeResults(self.queries[qid],
+                                      qidToOriginalResults[qid]);
+  });
 };
 
-LocalCollection.prototype._modifyAndNotify = function (doc, mod) {
+LocalCollection.prototype._modifyAndNotify = function (
+    doc, mod, recomputeQids) {
   var self = this;
 
   var matched_before = {};
@@ -419,6 +463,8 @@ LocalCollection.prototype._modifyAndNotify = function (doc, mod) {
     if (query.ordered) {
       matched_before[qid] = query.selector_f(doc);
     } else {
+      // Because we don't support skip or limit (yet) in unordered queries, we
+      // can just do a direct lookup.
       matched_before[qid] = _.has(query.results, doc._id);
     }
   }
@@ -431,12 +477,24 @@ LocalCollection.prototype._modifyAndNotify = function (doc, mod) {
     query = self.queries[qid];
     var before = matched_before[qid];
     var after = query.selector_f(doc);
-    if (before && !after)
+
+    if (query.cursor.skip || query.cursor.limit) {
+      // We need to recompute any query where the doc may have been in the
+      // cursor's window either before or after the update. (Note that if skip
+      // or limit is set, "before" and "after" being true do not necessarily
+      // mean that the document is in the cursor's output after skip/limit is
+      // applied... but if they are false, then the document definitely is NOT
+      // in the output. So it's safe to skip recompute if neither before or
+      // after are true.)
+      if (before || after)
+	recomputeQids[qid] = true;
+    } else if (before && !after) {
       LocalCollection._removeFromResults(query, doc);
-    else if (!before && after)
+    } else if (!before && after) {
       LocalCollection._insertInResults(query, doc);
-    else if (before && after)
+    } else if (before && after) {
       LocalCollection._updateInResults(query, doc, old_doc);
+    }
   }
 };
 
@@ -463,6 +521,9 @@ LocalCollection._deepcopy = function (v) {
 
 // XXX the sorted-query logic below is laughably inefficient. we'll
 // need to come up with a better datastructure for this.
+//
+// XXX the logic for observing with a skip or a limit is even more
+// laughably inefficient. we recompute the whole results every time!
 
 LocalCollection._insertInResults = function (query, doc) {
   if (query.ordered) {
@@ -517,6 +578,25 @@ LocalCollection._updateInResults = function (query, doc, old_doc) {
     query.moved(LocalCollection._deepcopy(doc), orig_idx, new_idx);
 };
 
+// Recomputes the results of a query and runs observe callbacks for the
+// difference between the previous results and the current results (unless
+// paused). Used for skip/limit queries.
+//
+// When this is used by insert or remove, it can just use query.results for the
+// old results (and there's no need to pass in oldResults), because these
+// operations don't mutate the documents in the collection. Update needs to pass
+// in an oldResults which was deep-copied before the modifier was applied.
+LocalCollection._recomputeResults = function (query, oldResults) {
+  if (!oldResults)
+    oldResults = query.results;
+  query.results = query.cursor._getRawObjects(query.ordered);
+
+  if (!query.paused)
+    LocalCollection._diffQuery(
+      query.ordered, oldResults, query.results, query, true);
+};
+
+
 LocalCollection._findInOrderedResults = function (query, doc) {
   if (!query.ordered)
     throw new Error("Can't call _findInOrderedResults on unordered query");
diff --git a/packages/minimongo/minimongo_tests.js b/packages/minimongo/minimongo_tests.js
index 6e1731c08f..d1629e40f8 100644
--- a/packages/minimongo/minimongo_tests.js
+++ b/packages/minimongo/minimongo_tests.js
@@ -59,116 +59,83 @@ var log_callbacks = function (operations) {
 };
 
 // XXX test shared structure in all MM entrypoints
+Tinytest.add("minimongo - basics", function (test) {
+  var c = new LocalCollection();
 
-_.each(['observe', '_observeUnordered'], function (observeMethod) {
-  Tinytest.add("minimongo - basics (" + observeMethod + ")", function (test) {
-    var c = new LocalCollection();
+  c.insert({type: "kitten", name: "fluffy"});
+  c.insert({type: "kitten", name: "snookums"});
+  c.insert({type: "cryptographer", name: "alice"});
+  c.insert({type: "cryptographer", name: "bob"});
+  c.insert({type: "cryptographer", name: "cara"});
+  test.equal(c.find().count(), 5);
+  test.equal(c.find({type: "kitten"}).count(), 2);
+  test.equal(c.find({type: "cryptographer"}).count(), 3);
+  test.length(c.find({type: "kitten"}).fetch(), 2);
+  test.length(c.find({type: "cryptographer"}).fetch(), 3);
 
-    c.insert({type: "kitten", name: "fluffy"});
-    c.insert({type: "kitten", name: "snookums"});
-    c.insert({type: "cryptographer", name: "alice"});
-    c.insert({type: "cryptographer", name: "bob"});
-    c.insert({type: "cryptographer", name: "cara"});
-    test.equal(c.find().count(), 5);
-    test.equal(c.find({type: "kitten"}).count(), 2);
-    test.equal(c.find({type: "cryptographer"}).count(), 3);
-    test.length(c.find({type: "kitten"}).fetch(), 2);
-    test.length(c.find({type: "cryptographer"}).fetch(), 3);
+  c.remove({name: "cara"});
+  test.equal(c.find().count(), 4);
+  test.equal(c.find({type: "kitten"}).count(), 2);
+  test.equal(c.find({type: "cryptographer"}).count(), 2);
+  test.length(c.find({type: "kitten"}).fetch(), 2);
+  test.length(c.find({type: "cryptographer"}).fetch(), 2);
 
-    c.remove({name: "cara"});
-    test.equal(c.find().count(), 4);
-    test.equal(c.find({type: "kitten"}).count(), 2);
-    test.equal(c.find({type: "cryptographer"}).count(), 2);
-    test.length(c.find({type: "kitten"}).fetch(), 2);
-    test.length(c.find({type: "cryptographer"}).fetch(), 2);
+  c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
+  test.equal(c.find().count(), 4);
+  test.equal(c.find({type: "kitten"}).count(), 1);
+  test.equal(c.find({type: "cryptographer"}).count(), 3);
+  test.length(c.find({type: "kitten"}).fetch(), 1);
+  test.length(c.find({type: "cryptographer"}).fetch(), 3);
 
-    c.update({name: "snookums"}, {$set: {type: "cryptographer"}});
-    test.equal(c.find().count(), 4);
-    test.equal(c.find({type: "kitten"}).count(), 1);
-    test.equal(c.find({type: "cryptographer"}).count(), 3);
-    test.length(c.find({type: "kitten"}).fetch(), 1);
-    test.length(c.find({type: "cryptographer"}).fetch(), 3);
+  c.remove(null);
+  c.remove(false);
+  c.remove(undefined);
+  test.equal(c.find().count(), 4);
 
-    c.remove(null);
-    c.remove(false);
-    c.remove(undefined);
-    test.equal(c.find().count(), 4);
+  c.remove({_id: null});
+  c.remove({_id: false});
+  c.remove({_id: undefined});
+  c.remove();
+  test.equal(c.find().count(), 4);
 
-    c.remove({_id: null});
-    c.remove({_id: false});
-    c.remove({_id: undefined});
-    c.remove();
-    test.equal(c.find().count(), 4);
+  c.remove({});
+  test.equal(c.find().count(), 0);
 
-    c.remove({});
-    test.equal(c.find().count(), 0);
+  c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});
+  c.insert({_id: 2, name: "apple", tags: ["fruit", "red", "hard"]});
+  c.insert({_id: 3, name: "rose", tags: ["flower", "red", "squishy"]});
 
-    c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});
-    c.insert({_id: 2, name: "apple", tags: ["fruit", "red", "hard"]});
-    c.insert({_id: 3, name: "rose", tags: ["flower", "red", "squishy"]});
+  test.equal(c.find({tags: "flower"}).count(), 1);
+  test.equal(c.find({tags: "fruit"}).count(), 2);
+  test.equal(c.find({tags: "red"}).count(), 3);
+  test.length(c.find({tags: "flower"}).fetch(), 1);
+  test.length(c.find({tags: "fruit"}).fetch(), 2);
+  test.length(c.find({tags: "red"}).fetch(), 3);
 
-    test.equal(c.find({tags: "flower"}).count(), 1);
-    test.equal(c.find({tags: "fruit"}).count(), 2);
-    test.equal(c.find({tags: "red"}).count(), 3);
-    test.length(c.find({tags: "flower"}).fetch(), 1);
-    test.length(c.find({tags: "fruit"}).fetch(), 2);
-    test.length(c.find({tags: "red"}).fetch(), 3);
+  test.equal(c.findOne(1).name, "strawberry");
+  test.equal(c.findOne(2).name, "apple");
+  test.equal(c.findOne(3).name, "rose");
+  test.equal(c.findOne(4), undefined);
+  test.equal(c.findOne("abc"), undefined);
+  test.equal(c.findOne(undefined), undefined);
 
-    test.equal(c.findOne(1).name, "strawberry");
-    test.equal(c.findOne(2).name, "apple");
-    test.equal(c.findOne(3).name, "rose");
-    test.equal(c.findOne(4), undefined);
-    test.equal(c.findOne("abc"), undefined);
-    test.equal(c.findOne(undefined), undefined);
+  test.equal(c.find(1).count(), 1);
+  test.equal(c.find(4).count(), 0);
+  test.equal(c.find("abc").count(), 0);
+  test.equal(c.find(undefined).count(), 0);
+  test.equal(c.find().count(), 3);
+  test.equal(c.find(1, {skip: 1}).count(), 0);
+  test.equal(c.find({_id: 1}, {skip: 1}).count(), 0);
 
-    test.equal(c.find(1).count(), 1);
-    test.equal(c.find(4).count(), 0);
-    test.equal(c.find("abc").count(), 0);
-    test.equal(c.find(undefined).count(), 0);
-    test.equal(c.find().count(), 3);
+  // Regression test for #455.
+  c.insert({foo: {bar: 'baz'}});
+  test.equal(c.find({foo: {bam: 'baz'}}).count(), 0);
+  test.equal(c.find({foo: {bar: 'baz'}}).count(), 1);
 
-    // Regression test for #455.
-    c.insert({foo: {bar: 'baz'}});
-    test.equal(c.find({foo: {bam: 'baz'}}).count(), 0);
-    test.equal(c.find({foo: {bar: 'baz'}}).count(), 1);
-
-    // Duplicate ID.
-    test.throws(function () { c.insert({_id: 1, name: "bla"}); });
-    test.equal(c.find({_id: 1}).count(), 1);
-    test.equal(c.findOne(1).name, "strawberry");
-
-    var ev = "";
-    var makecb = function (tag) {
-      return {
-        added: function (doc) { ev += "a" + tag + doc._id + "_"; },
-        changed: function (doc) { ev += "c" + tag + doc._id + "_"; },
-        removed: function (doc) { ev += "r" + tag + doc._id + "_"; }
-      };
-    };
-    var expect = function (x) {
-      test.equal(ev, x);
-      ev = "";
-    };
-    // This should work equally well for ordered and unordered observations
-    // (because the callbacks don't look at indices and there's no 'moved'
-    // callback).
-    var handle = c.find({tags: "flower"})[observeMethod](makecb('a'));
-    expect("aa3_");
-    c.update({name: "rose"}, {$set: {tags: ["bloom", "red", "squishy"]}});
-    expect("ra3_");
-    c.update({name: "rose"}, {$set: {tags: ["flower", "red", "squishy"]}});
-    expect("aa3_");
-    c.update({name: "rose"}, {$set: {food: false}});
-    expect("ca3_");
-    c.remove({});
-    expect("ra3_");
-    c.insert({_id: 4, name: "daisy", tags: ["flower"]});
-    expect("aa4_");
-    handle.stop();
-    // After calling stop, no more callbacks are called.
-    c.insert({_id: 5, name: "iris", tags: ["flower"]});
-    expect("");
-  });
+  // Duplicate ID.
+  test.throws(function () { c.insert({_id: 1, name: "bla"}); });
+  test.equal(c.find({_id: 1}).count(), 1);
+  test.equal(c.findOne(1).name, "strawberry");
 });
 
 Tinytest.add("minimongo - cursors", function (test) {
@@ -579,10 +546,262 @@ Tinytest.add("minimongo - selector_compiler", function (test) {
   match({"a.b": {$in: [1, 2, 3]}}, {a: {b: [4, 2]}});
   nomatch({"a.b": {$in: [1, 2, 3]}}, {a: {b: [4]}});
 
+  // $or
+  test.throws(function () {
+    match({$or: []}, {});
+  });
+  test.throws(function () {
+    match({$or: []}, {a: 1});
+  });
+  match({$or: [{a: 1}]}, {a: 1});
+  nomatch({$or: [{b: 2}]}, {a: 1});
+  match({$or: [{a: 1}, {b: 2}]}, {a: 1});
+  nomatch({$or: [{c: 3}, {d: 4}]}, {a: 1});
+  match({$or: [{a: 1}, {b: 2}]}, {a: [1, 2, 3]});
+  nomatch({$or: [{a: 1}, {b: 2}]}, {c: [1, 2, 3]});
+  nomatch({$or: [{a: 1}, {b: 2}]}, {a: [2, 3, 4]});
+  match({$or: [{a: 1}, {a: 2}]}, {a: 1});
+  match({$or: [{a: 1}, {a: 2}], b: 2}, {a: 1, b: 2});
+  nomatch({$or: [{a: 2}, {a: 3}], b: 2}, {a: 1, b: 2});
+  nomatch({$or: [{a: 1}, {a: 2}], b: 3}, {a: 1, b: 2});
+
+  // $or and $lt, $lte, $gt, $gte
+  match({$or: [{a: {$lte: 1}}, {a: 2}]}, {a: 1});
+  nomatch({$or: [{a: {$lt: 1}}, {a: 2}]}, {a: 1});
+  match({$or: [{a: {$gte: 1}}, {a: 2}]}, {a: 1});
+  nomatch({$or: [{a: {$gt: 1}}, {a: 2}]}, {a: 1});
+  match({$or: [{b: {$gt: 1}}, {b: {$lt: 3}}]}, {b: 2});
+  nomatch({$or: [{b: {$lt: 1}}, {b: {$gt: 3}}]}, {b: 2});
+
+  // $or and $in
+  match({$or: [{a: {$in: [1, 2, 3]}}]}, {a: 1});
+  nomatch({$or: [{a: {$in: [4, 5, 6]}}]}, {a: 1});
+  match({$or: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {a: 1});
+  match({$or: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {b: 2});
+  nomatch({$or: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {c: 3});
+  match({$or: [{a: {$in: [1, 2, 3]}}, {b: {$in: [1, 2, 3]}}]}, {b: 2});
+  nomatch({$or: [{a: {$in: [1, 2, 3]}}, {b: {$in: [4, 5, 6]}}]}, {b: 2});
+
+  // $or and $nin
+  nomatch({$or: [{a: {$nin: [1, 2, 3]}}]}, {a: 1});
+  match({$or: [{a: {$nin: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$or: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {a: 1});
+  match({$or: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {b: 2});
+  match({$or: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {c: 3});
+  match({$or: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [1, 2, 3]}}]}, {b: 2});
+  nomatch({$or: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [1, 2, 3]}}]}, {a: 1, b: 2});
+  match({$or: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [4, 5, 6]}}]}, {b: 2});
+
+  // $or and dot-notation
+  match({$or: [{"a.b": 1}, {"a.b": 2}]}, {a: {b: 1}});
+  match({$or: [{"a.b": 1}, {"a.c": 1}]}, {a: {b: 1}});
+  nomatch({$or: [{"a.b": 2}, {"a.c": 1}]}, {a: {b: 1}});
+
+  // $or and nested objects
+  match({$or: [{a: {b: 1, c: 2}}, {a: {b: 2, c: 1}}]}, {a: {b: 1, c: 2}});
+  nomatch({$or: [{a: {b: 1, c: 3}}, {a: {b: 2, c: 1}}]}, {a: {b: 1, c: 2}});
+
+  // $or and regexes
+  match({$or: [{a: /a/}]}, {a: "cat"});
+  nomatch({$or: [{a: /o/}]}, {a: "cat"});
+  match({$or: [{a: /a/}, {a: /o/}]}, {a: "cat"});
+  nomatch({$or: [{a: /i/}, {a: /o/}]}, {a: "cat"});
+  match({$or: [{a: /i/}, {b: /o/}]}, {a: "cat", b: "dog"});
+
+  // $or and $ne
+  match({$or: [{a: {$ne: 1}}]}, {});
+  nomatch({$or: [{a: {$ne: 1}}]}, {a: 1});
+  match({$or: [{a: {$ne: 1}}]}, {a: 2});
+  match({$or: [{a: {$ne: 1}}]}, {b: 1});
+  match({$or: [{a: {$ne: 1}}, {a: {$ne: 2}}]}, {a: 1});
+  match({$or: [{a: {$ne: 1}}, {b: {$ne: 1}}]}, {a: 1});
+  nomatch({$or: [{a: {$ne: 1}}, {b: {$ne: 2}}]}, {a: 1, b: 2});
+
+  // $or and $not
+  match({$or: [{a: {$not: {$mod: [10, 1]}}}]}, {});
+  nomatch({$or: [{a: {$not: {$mod: [10, 1]}}}]}, {a: 1});
+  match({$or: [{a: {$not: {$mod: [10, 1]}}}]}, {a: 2});
+  match({$or: [{a: {$not: {$mod: [10, 1]}}}, {a: {$not: {$mod: [10, 2]}}}]}, {a: 1});
+  nomatch({$or: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 1});
+  match({$or: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 2});
+  match({$or: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 3});
+  // this is possibly an open-ended task, so we stop here ...
+  
+  // $nor
+  test.throws(function () {
+    match({$nor: []}, {});
+  });
+  test.throws(function () {
+    match({$nor: []}, {a: 1});
+  });
+  nomatch({$nor: [{a: 1}]}, {a: 1});
+  match({$nor: [{b: 2}]}, {a: 1});
+  nomatch({$nor: [{a: 1}, {b: 2}]}, {a: 1});
+  match({$nor: [{c: 3}, {d: 4}]}, {a: 1});
+  nomatch({$nor: [{a: 1}, {b: 2}]}, {a: [1, 2, 3]});
+  match({$nor: [{a: 1}, {b: 2}]}, {c: [1, 2, 3]});
+  match({$nor: [{a: 1}, {b: 2}]}, {a: [2, 3, 4]});
+  nomatch({$nor: [{a: 1}, {a: 2}]}, {a: 1});
+
+  // $nor and $lt, $lte, $gt, $gte
+  nomatch({$nor: [{a: {$lte: 1}}, {a: 2}]}, {a: 1});
+  match({$nor: [{a: {$lt: 1}}, {a: 2}]}, {a: 1});
+  nomatch({$nor: [{a: {$gte: 1}}, {a: 2}]}, {a: 1});
+  match({$nor: [{a: {$gt: 1}}, {a: 2}]}, {a: 1});
+  nomatch({$nor: [{b: {$gt: 1}}, {b: {$lt: 3}}]}, {b: 2});
+  match({$nor: [{b: {$lt: 1}}, {b: {$gt: 3}}]}, {b: 2});
+
+  // $nor and $in
+  nomatch({$nor: [{a: {$in: [1, 2, 3]}}]}, {a: 1});
+  match({$nor: [{a: {$in: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$nor: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {a: 1});
+  nomatch({$nor: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {b: 2});
+  match({$nor: [{a: {$in: [1, 2, 3]}}, {b: 2}]}, {c: 3});
+  nomatch({$nor: [{a: {$in: [1, 2, 3]}}, {b: {$in: [1, 2, 3]}}]}, {b: 2});
+  match({$nor: [{a: {$in: [1, 2, 3]}}, {b: {$in: [4, 5, 6]}}]}, {b: 2});
+
+  // $nor and $nin
+  match({$nor: [{a: {$nin: [1, 2, 3]}}]}, {a: 1});
+  nomatch({$nor: [{a: {$nin: [4, 5, 6]}}]}, {a: 1});
+  match({$nor: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {a: 1});
+  nomatch({$nor: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {b: 2});
+  nomatch({$nor: [{a: {$nin: [1, 2, 3]}}, {b: 2}]}, {c: 3});
+  nomatch({$nor: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [1, 2, 3]}}]}, {b: 2});
+  match({$nor: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [1, 2, 3]}}]}, {a: 1, b: 2});
+  nomatch({$nor: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [4, 5, 6]}}]}, {b: 2});
+
+  // $nor and dot-notation
+  nomatch({$nor: [{"a.b": 1}, {"a.b": 2}]}, {a: {b: 1}});
+  nomatch({$nor: [{"a.b": 1}, {"a.c": 1}]}, {a: {b: 1}});
+  match({$nor: [{"a.b": 2}, {"a.c": 1}]}, {a: {b: 1}});
+
+  // $nor and nested objects
+  nomatch({$nor: [{a: {b: 1, c: 2}}, {a: {b: 2, c: 1}}]}, {a: {b: 1, c: 2}});
+  match({$nor: [{a: {b: 1, c: 3}}, {a: {b: 2, c: 1}}]}, {a: {b: 1, c: 2}});
+
+  // $nor and regexes
+  nomatch({$nor: [{a: /a/}]}, {a: "cat"});
+  match({$nor: [{a: /o/}]}, {a: "cat"});
+  nomatch({$nor: [{a: /a/}, {a: /o/}]}, {a: "cat"});
+  match({$nor: [{a: /i/}, {a: /o/}]}, {a: "cat"});
+  nomatch({$nor: [{a: /i/}, {b: /o/}]}, {a: "cat", b: "dog"});
+
+  // $nor and $ne
+  nomatch({$nor: [{a: {$ne: 1}}]}, {});
+  match({$nor: [{a: {$ne: 1}}]}, {a: 1});
+  nomatch({$nor: [{a: {$ne: 1}}]}, {a: 2});
+  nomatch({$nor: [{a: {$ne: 1}}]}, {b: 1});
+  nomatch({$nor: [{a: {$ne: 1}}, {a: {$ne: 2}}]}, {a: 1});
+  nomatch({$nor: [{a: {$ne: 1}}, {b: {$ne: 1}}]}, {a: 1});
+  match({$nor: [{a: {$ne: 1}}, {b: {$ne: 2}}]}, {a: 1, b: 2});
+
+  // $nor and $not
+  nomatch({$nor: [{a: {$not: {$mod: [10, 1]}}}]}, {});
+  match({$nor: [{a: {$not: {$mod: [10, 1]}}}]}, {a: 1});
+  nomatch({$nor: [{a: {$not: {$mod: [10, 1]}}}]}, {a: 2});
+  nomatch({$nor: [{a: {$not: {$mod: [10, 1]}}}, {a: {$not: {$mod: [10, 2]}}}]}, {a: 1});
+  match({$nor: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 1});
+  nomatch({$nor: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 2});
+  nomatch({$nor: [{a: {$not: {$mod: [10, 1]}}}, {a: {$mod: [10, 2]}}]}, {a: 3});
+
+  // $and
+
+  test.throws(function () {
+    match({$and: []}, {});
+  });
+  test.throws(function () {
+    match({$and: []}, {a: 1});
+  });
+  match({$and: [{a: 1}]}, {a: 1});
+  nomatch({$and: [{a: 1}, {a: 2}]}, {a: 1});
+  nomatch({$and: [{a: 1}, {b: 1}]}, {a: 1});
+  match({$and: [{a: 1}, {b: 2}]}, {a: 1, b: 2});
+  nomatch({$and: [{a: 1}, {b: 1}]}, {a: 1, b: 2});
+  match({$and: [{a: 1}, {b: 2}], c: 3}, {a: 1, b: 2, c: 3});
+  nomatch({$and: [{a: 1}, {b: 2}], c: 4}, {a: 1, b: 2, c: 3});
+
+  // $and and regexes
+  match({$and: [{a: /a/}]}, {a: "cat"});
+  match({$and: [{a: /a/i}]}, {a: "CAT"});
+  nomatch({$and: [{a: /o/}]}, {a: "cat"});
+  nomatch({$and: [{a: /a/}, {a: /o/}]}, {a: "cat"});
+  match({$and: [{a: /a/}, {b: /o/}]}, {a: "cat", b: "dog"});
+  nomatch({$and: [{a: /a/}, {b: /a/}]}, {a: "cat", b: "dog"});
+
+  // $and, dot-notation, and nested objects
+  match({$and: [{"a.b": 1}]}, {a: {b: 1}});
+  match({$and: [{a: {b: 1}}]}, {a: {b: 1}});
+  nomatch({$and: [{"a.b": 2}]}, {a: {b: 1}});
+  nomatch({$and: [{"a.c": 1}]}, {a: {b: 1}});
+  nomatch({$and: [{"a.b": 1}, {"a.b": 2}]}, {a: {b: 1}});
+  nomatch({$and: [{"a.b": 1}, {a: {b: 2}}]}, {a: {b: 1}});
+  match({$and: [{"a.b": 1}, {"c.d": 2}]}, {a: {b: 1}, c: {d: 2}});
+  nomatch({$and: [{"a.b": 1}, {"c.d": 1}]}, {a: {b: 1}, c: {d: 2}});
+  match({$and: [{"a.b": 1}, {c: {d: 2}}]}, {a: {b: 1}, c: {d: 2}});
+  nomatch({$and: [{"a.b": 1}, {c: {d: 1}}]}, {a: {b: 1}, c: {d: 2}});
+  nomatch({$and: [{"a.b": 2}, {c: {d: 2}}]}, {a: {b: 1}, c: {d: 2}});
+  match({$and: [{a: {b: 1}}, {c: {d: 2}}]}, {a: {b: 1}, c: {d: 2}});
+  nomatch({$and: [{a: {b: 2}}, {c: {d: 2}}]}, {a: {b: 1}, c: {d: 2}});
+
+  // $and and $in
+  nomatch({$and: [{a: {$in: []}}]}, {});
+  match({$and: [{a: {$in: [1, 2, 3]}}]}, {a: 1});
+  nomatch({$and: [{a: {$in: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$and: [{a: {$in: [1, 2, 3]}}, {a: {$in: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$and: [{a: {$in: [1, 2, 3]}}, {b: {$in: [1, 2, 3]}}]}, {a: 1, b: 4});
+  match({$and: [{a: {$in: [1, 2, 3]}}, {b: {$in: [4, 5, 6]}}]}, {a: 1, b: 4});
+
+
+  // $and and $nin
+  match({$and: [{a: {$nin: []}}]}, {});
+  nomatch({$and: [{a: {$nin: [1, 2, 3]}}]}, {a: 1});
+  match({$and: [{a: {$nin: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$and: [{a: {$nin: [1, 2, 3]}}, {a: {$nin: [4, 5, 6]}}]}, {a: 1});
+  nomatch({$and: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [1, 2, 3]}}]}, {a: 1, b: 4});
+  nomatch({$and: [{a: {$nin: [1, 2, 3]}}, {b: {$nin: [4, 5, 6]}}]}, {a: 1, b: 4});
+
+  // $and and $lt, $lte, $gt, $gte
+  match({$and: [{a: {$lt: 2}}]}, {a: 1}); 
+  nomatch({$and: [{a: {$lt: 1}}]}, {a: 1}); 
+  match({$and: [{a: {$lte: 1}}]}, {a: 1}); 
+  match({$and: [{a: {$gt: 0}}]}, {a: 1}); 
+  nomatch({$and: [{a: {$gt: 1}}]}, {a: 1}); 
+  match({$and: [{a: {$gte: 1}}]}, {a: 1}); 
+  match({$and: [{a: {$gt: 0}}, {a: {$lt: 2}}]}, {a: 1}); 
+  nomatch({$and: [{a: {$gt: 1}}, {a: {$lt: 2}}]}, {a: 1}); 
+  nomatch({$and: [{a: {$gt: 0}}, {a: {$lt: 1}}]}, {a: 1}); 
+  match({$and: [{a: {$gte: 1}}, {a: {$lte: 1}}]}, {a: 1}); 
+  nomatch({$and: [{a: {$gte: 2}}, {a: {$lte: 0}}]}, {a: 1}); 
+
+  // $and and $ne
+  match({$and: [{a: {$ne: 1}}]}, {});
+  nomatch({$and: [{a: {$ne: 1}}]}, {a: 1});
+  match({$and: [{a: {$ne: 1}}]}, {a: 2});
+  nomatch({$and: [{a: {$ne: 1}}, {a: {$ne: 2}}]}, {a: 2});
+  match({$and: [{a: {$ne: 1}}, {a: {$ne: 3}}]}, {a: 2});
+
+  // $and and $not
+  match({$and: [{a: {$not: {$gt: 2}}}]}, {a: 1});
+  nomatch({$and: [{a: {$not: {$lt: 2}}}]}, {a: 1});
+  match({$and: [{a: {$not: {$lt: 0}}}, {a: {$not: {$gt: 2}}}]}, {a: 1});
+  nomatch({$and: [{a: {$not: {$lt: 2}}}, {a: {$not: {$gt: 0}}}]}, {a: 1});
+
+  // $where
+  match({$where: "this.a === 1"}, {a: 1});
+  nomatch({$where: "this.a !== 1"}, {a: 1});
+  nomatch({$where: "this.a === 1", a: 2}, {a: 1});
+  match({$where: "this.a === 1", b: 2}, {a: 1, b: 2});
+  match({$where: "this.a === 1 && this.b === 2"}, {a: 1, b: 2});
+  match({$where: "_.isArray(this.a)"}, {a: []});
+  nomatch({$where: "_.isArray(this.a)"}, {a: 1});
+
+  match({"dogs.0.name": "Fido"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
+  match({"dogs.1.name": "Rex"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
+  nomatch({"dogs.1.name": "Fido"}, {dogs: [{name: "Fido"}, {name: "Rex"}]});
+  match({"room.1b": "bla"}, {room: {"1b": "bla"}});
+
   // XXX still needs tests:
-  // - $or, $and, $nor, $where
   // - $elemMatch
-  // - people.2.name
   // - non-scalar arguments to $gt, $lt, etc
 });
 
@@ -660,6 +879,40 @@ Tinytest.add("minimongo - sort", function (test) {
       {a: 47, b: 1, _id: "47_1"}]);
 });
 
+Tinytest.add("minimongo - subkey sort", function (test) {
+  var c = new LocalCollection();
+
+  // normal case
+  c.insert({a: {b: 2}});
+  c.insert({a: {b: 1}});
+  c.insert({a: {b: 3}});
+  test.equal(
+    _.pluck(c.find({}, {sort: {'a.b': -1}}).fetch(), 'a'),
+    [{b: 3}, {b: 2}, {b: 1}]);
+
+  // isn't an object
+  c.insert({a: 1});
+  test.equal(
+    _.pluck(c.find({}, {sort: {'a.b': 1}}).fetch(), 'a'),
+    [1, {b: 1}, {b: 2}, {b: 3}]);
+
+  // complex object
+  c.insert({a: {b: {c: 1}}});
+  test.equal(
+    _.pluck(c.find({}, {sort: {'a.b': -1}}).fetch(), 'a'),
+    [{b: {c: 1}}, {b: 3}, {b: 2}, {b: 1}, 1]);
+
+  // no such top level prop
+  c.insert({c: 1});
+  test.equal(
+    _.pluck(c.find({}, {sort: {'a.b': -1}}).fetch(), 'a'),
+    [{b: {c: 1}}, {b: 3}, {b: 2}, {b: 1}, 1, undefined]);
+
+  // no such mid level prop. just test that it doesn't throw.
+  test.equal(c.find({}, {sort: {'a.nope.c': -1}}).count(), 6);
+});
+
+
 Tinytest.add("minimongo - modify", function (test) {
   var modify = function (doc, mod, result) {
     var copy = LocalCollection._deepcopy(doc);
@@ -904,7 +1157,7 @@ Tinytest.add("minimongo - modify", function (test) {
 
 // XXX test update() (selecting docs, multi, upsert..)
 
-Tinytest.add("minimongo - observe", function (test) {
+Tinytest.add("minimongo - observe ordered", function (test) {
   var operations = [];
   var cbs = log_callbacks(operations);
   var handle;
@@ -948,8 +1201,83 @@ Tinytest.add("minimongo - observe", function (test) {
   c.insert({a:100});
   test.equal(operations.shift(), ['added', {a:100}, 0]);
   handle.stop();
+
+  // test skip and limit.
+  c.remove({});
+  handle = c.find({}, {sort: {a: 1}, skip: 1, limit: 2}).observe(cbs);
+  test.equal(operations.shift(), undefined);
+  c.insert({a:1});
+  test.equal(operations.shift(), undefined);
+  c.insert({a:2});
+  test.equal(operations.shift(), ['added', {a:2}, 0]);
+  c.insert({a:3});
+  test.equal(operations.shift(), ['added', {a:3}, 1]);
+  c.insert({a:4});
+  test.equal(operations.shift(), undefined);
+  id = c.findOne({a:2})._id;
+  c.update({a:1}, {a:0});
+  test.equal(operations.shift(), undefined);
+  c.update({a:0}, {a:5});
+  test.equal(operations.shift(), ['removed', id, 0, {a:2}]);
+  test.equal(operations.shift(), ['added', {a:4}, 1]);
+  c.update({a:3}, {a:3.5});
+  test.equal(operations.shift(), ['changed', {a:3.5}, 0, {a:3}]);
+
+  handle.stop();
 });
 
+_.each(['observe', '_observeUnordered'], function (observeMethod) {
+  Tinytest.add("minimongo - observe (" + observeMethod + ")", function (test) {
+    var c = new LocalCollection();
+
+    var ev = "";
+    var makecb = function (tag) {
+      return {
+        added: function (doc) { ev += "a" + tag + doc._id + "_"; },
+        changed: function (doc) { ev += "c" + tag + doc._id + "_"; },
+        removed: function (doc) { ev += "r" + tag + doc._id + "_"; }
+      };
+    };
+    var expect = function (x) {
+      test.equal(ev, x);
+      ev = "";
+    };
+
+    c.insert({_id: 1, name: "strawberry", tags: ["fruit", "red", "squishy"]});
+    c.insert({_id: 2, name: "apple", tags: ["fruit", "red", "hard"]});
+    c.insert({_id: 3, name: "rose", tags: ["flower", "red", "squishy"]});
+
+    // This should work equally well for ordered and unordered observations
+    // (because the callbacks don't look at indices and there's no 'moved'
+    // callback).
+    var handle = c.find({tags: "flower"})[observeMethod](makecb('a'));
+    expect("aa3_");
+    c.update({name: "rose"}, {$set: {tags: ["bloom", "red", "squishy"]}});
+    expect("ra3_");
+    c.update({name: "rose"}, {$set: {tags: ["flower", "red", "squishy"]}});
+    expect("aa3_");
+    c.update({name: "rose"}, {$set: {food: false}});
+    expect("ca3_");
+    c.remove({});
+    expect("ra3_");
+    c.insert({_id: 4, name: "daisy", tags: ["flower"]});
+    expect("aa4_");
+    handle.stop();
+    // After calling stop, no more callbacks are called.
+    c.insert({_id: 5, name: "iris", tags: ["flower"]});
+    expect("");
+
+    // Test that observing a lookup by ID works.
+    handle = c.find(4)[observeMethod](makecb('b'));
+    expect('ab4_');
+    c.update(4, {$set: {eek: 5}});
+    expect('cb4_');
+    handle.stop();
+  });
+});
+
+
+
 Tinytest.add("minimongo - diff", function (test) {
 
   // test correctness
@@ -1024,7 +1352,7 @@ Tinytest.add("minimongo - diff", function (test) {
         test.isTrue(_.has(results, doc._id));
         test.equal(results[doc._id], oldDoc);
         results[doc._id] = doc;
-      },
+      }
     };
 
     LocalCollection._diffQueryUnordered(oldResults, newResults, observer);
diff --git a/packages/minimongo/selector.js b/packages/minimongo/selector.js
index e85dce63ff..4d4e33c6b3 100644
--- a/packages/minimongo/selector.js
+++ b/packages/minimongo/selector.js
@@ -291,8 +291,6 @@ LocalCollection._selectorIsId = function (selector) {
   return (typeof selector === "string") || (typeof selector === "number");
 };
 
-// XXX implement ordinal indexing: 'people.2.name'
-
 // Given an arbitrary Mongo-style query selector, return an expression
 // that evaluates to true if the document in 'doc' matches the
 // selector, else false.
@@ -319,30 +317,30 @@ LocalCollection._exprForSelector = function (selector, literals) {
 // value in the selector. Return an expression that evaluates to true
 // if 'doc' matches this predicate, else false.
 LocalCollection._exprForDocumentPredicate = function (op, value, literals) {
+  if (op === '$or' || op === '$and' || op === '$nor') {
+    if (_.isEmpty(value) || !_.isArray(value))
+      throw Error("$and/$or/$nor must be a nonempty array");
+  }
+
+  var clauses;
   if (op === '$or') {
-    var clauses = [];
-    _.each(value, function (c) {
-      clauses.push(LocalCollection._exprForSelector(c, literals));
+    clauses = _.map(value, function (c) {
+      return LocalCollection._exprForSelector(c, literals);
     });
-    if (clauses.length === 0) return 'true';
     return '(' + clauses.join('||') +')';
   }
 
   if (op === '$and') {
-    var clauses = [];
-    _.each(value, function (c) {
-      clauses.push(LocalCollection._exprForSelector(c, literals));
+    clauses = _.map(value, function (c) {
+      return LocalCollection._exprForSelector(c, literals);
     });
-    if (clauses.length === 0) return 'true';
     return '(' + clauses.join('&&') +')';
   }
 
   if (op === '$nor') {
-    var clauses = [];
-    _.each(value, function (c) {
-      clauses.push("!(" + LocalCollection._exprForSelector(c, literals) + ")");
+    clauses = _.map(value, function (c) {
+      return "!(" + LocalCollection._exprForSelector(c, literals) + ")";
     });
-    if (clauses.length === 0) return 'true';
     return '(' + clauses.join('&&') +')';
   }
 
@@ -396,19 +394,31 @@ LocalCollection._exprForKeypathPredicate = function (keypath, value, literals) {
   // drilling down through the dotted parts
   var ret = '';
   var innermost = true;
+  var lastPartWasNumber = false;
   while (keyparts.length) {
     var part = keyparts.pop();
+    var thisPartIsNumber = false;
+    if (/^\d+$/.test(part)) {
+      part = +part;
+      thisPartIsNumber = true;
+    }
     var formal = keyparts.length ? "x" : "doc";
     if (innermost) {
       ret = '(function(x){return ' + predcode + ';})(' + formal + '&&' + formal + '[' +
         JSON.stringify(part) + '])';
       innermost = false;
+    } else if (lastPartWasNumber) {
+      // The last part was an array index, so if we find an array here we
+      // shouldn't search it!
+      ret = '(function(x){return ' + ret + ';})(' + formal + '&&' + formal + '[' +
+        JSON.stringify(part) + '])';
     } else {
-      // for all but the innermost level of a dotted expression,
-      // if the runtime type is an array, search it
+      // If the runtime type is an array, search it, unless we're already at the
+      // innermost bit, or if the next part is a number (ie, an array index).
       ret = 'f._matches(' + formal + '&&' + formal + '[' + JSON.stringify(part) +
         '], function(x){return ' + ret + ';})';
     }
+    lastPartWasNumber = thisPartIsNumber;
   }
 
   return ret;
diff --git a/packages/minimongo/sort.js b/packages/minimongo/sort.js
index 6d1d8077fe..94420cf237 100644
--- a/packages/minimongo/sort.js
+++ b/packages/minimongo/sort.js
@@ -11,8 +11,6 @@
 // first object comes first in order, 1 if the second object comes
 // first, or 0 if neither object comes before the other.
 
-// XXX sort does not yet support subkeys ('a.b') .. fix that!
-
 LocalCollection._compileSort = function (spec) {
   var keys = [];
   var asc = [];
@@ -44,14 +42,24 @@ LocalCollection._compileSort = function (spec) {
   var _func;
   var code = "_func = (function(c){return function(a,b){var x;";
   for (var i = 0; i < keys.length; i++) {
-    if (i !== 0)
+    // handle dotted subpaths. Make sure to avoid dereferencing
+    // undefined if a subkey doesn't exist.
+    var splittedKeys = keys[i].split(".");
+    var keyString = "";
+    var aCode = "a";
+    var bCode = "b";
+    for(var o = 0; o < splittedKeys.length; o++) {
+      keyString  = keyString + "[" + JSON.stringify(splittedKeys[o]) + "]";
+      aCode += '&&a' + keyString;
+      bCode += '&&b' + keyString;
+    }
+    if (i !== 0) {
       code += "if(x!==0)return x;";
+    }
     code += "x=" + (asc[i] ? "" : "-") +
-      "c(a[" + JSON.stringify(keys[i]) + "],b[" +
-      JSON.stringify(keys[i]) + "]);";
+      "c(" + aCode + "," + bCode + ");";
   }
   code += "return x;};})";
-
   eval(code);
   return _func(LocalCollection._f._cmp);
 };
diff --git a/packages/minimongo/uuid.js b/packages/minimongo/uuid.js
index c608515fa9..56d0916e71 100644
--- a/packages/minimongo/uuid.js
+++ b/packages/minimongo/uuid.js
@@ -112,7 +112,7 @@ LocalCollection.uuid = function () {
     s[i] = hexDigits.substr(Math.floor(LocalCollection.random() * 0x10), 1);
   }
   s[14] = "4";
-  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+  s[19] = hexDigits.substr((parseInt(s[19],16) & 0x3) | 0x8, 1);
   s[8] = s[13] = s[18] = s[23] = "-";
 
   var uuid = s.join("");
diff --git a/packages/mongo-livedata/collection.js b/packages/mongo-livedata/collection.js
index ddf5c3e04a..a719675820 100644
--- a/packages/mongo-livedata/collection.js
+++ b/packages/mongo-livedata/collection.js
@@ -163,6 +163,41 @@ _.extend(Meteor.Collection.prototype, {
 });
 
 
+// protect against dangerous selectors.  falsey and {_id: falsey} are both
+// likely programmer error, and not what you want, particularly for destructive
+// operations.  JS regexps don't serialize over DDP but can be trivially
+// replaced by $regex.
+Meteor.Collection._rewriteSelector = function (selector) {
+  // shorthand -- scalars match _id
+  if (LocalCollection._selectorIsId(selector))
+    selector = {_id: selector};
+
+  if (!selector || (('_id' in selector) && !selector._id))
+    // can't match anything
+    return {_id: Meteor.uuid()};
+
+  var ret = {};
+  _.each(selector, function (value, key) {
+    if (value instanceof RegExp) {
+      // XXX should also do this translation at lower levels (eg if the outer
+      // level is $and/$or/$nor, or if there's an $elemMatch)
+      ret[key] = {$regex: value.source};
+      var regexOptions = '';
+      // JS RegExp objects support 'i', 'm', and 'g'. Mongo regex $options
+      // support 'i', 'm', 'x', and 's'. So we support 'i' and 'm' here.
+      if (value.ignoreCase)
+        regexOptions += 'i';
+      if (value.multiline)
+        regexOptions += 'm';
+      if (regexOptions)
+        ret[key].$options = regexOptions;
+    }
+    else
+      ret[key] = value;
+  });
+  return ret;
+};
+
 // 'insert' immediately returns the inserted document's new _id.  The
 // others return nothing.
 //
@@ -217,6 +252,8 @@ _.each(["insert", "update", "remove"], function (name) {
       if ('_id' in args[0])
         throw new Error("Do not pass an _id to insert. Meteor will generate the _id for you.");
       ret = args[0]._id = Meteor.uuid();
+    } else {
+      args[0] = Meteor.Collection._rewriteSelector(args[0]);
     }
 
     if (self._manager && self._manager !== Meteor.default_server) {
diff --git a/packages/mongo-livedata/mongo_driver.js b/packages/mongo-livedata/mongo_driver.js
index 72cd5cb25b..bda3fc6432 100644
--- a/packages/mongo-livedata/mongo_driver.js
+++ b/packages/mongo-livedata/mongo_driver.js
@@ -19,6 +19,14 @@ _Mongo = function (url) {
 
   self._liveResultsSets = {};
 
+  // Set autoReconnect on Mongo URLs by default.
+  if (!(/[\?&]autoReconnect/.test(url))) {
+    if (/\?/.test(url))
+      url += '&autoReconnect=true';
+    else
+      url += '?autoReconnect=true';
+  }
+
   MongoDB.connect(url, {db: {safe: true}}, function(err, db) {
     if (err)
       throw err;
@@ -34,21 +42,6 @@ _Mongo = function (url) {
   });
 };
 
-// protect against dangerous selectors.  falsey and {_id: falsey}
-// are both likely programmer error, and not what you want,
-// particularly for destructive operations.
-_Mongo._rewriteSelector = function (selector) {
-  // shorthand -- scalars match _id
-  if ((typeof selector === 'string') || (typeof selector === 'number'))
-    selector = {_id: selector};
-
-  if (!selector || (('_id' in selector) && !selector._id))
-    // can't match anything
-    return {_id: Meteor.uuid()};
-  else
-    return selector;
-};
-
 // callback: lambda (err, collection) called when
 // collection is ready to go, or on error.
 _Mongo.prototype._withCollection = function(collection_name, callback) {
@@ -137,9 +130,6 @@ _Mongo.prototype.remove = function (collection_name, selector) {
 
   var write = self._maybeBeginWrite();
 
-  // XXX does not allow options. matches the client.
-  selector = _Mongo._rewriteSelector(selector);
-
   var future = new Future;
   self._withCollection(collection_name, function (err, collection) {
     if (err) {
@@ -171,7 +161,6 @@ _Mongo.prototype.update = function (collection_name, selector, mod, options) {
 
   var write = self._maybeBeginWrite();
 
-  selector = _Mongo._rewriteSelector(selector);
   if (!options) options = {};
 
   var future = new Future;
@@ -271,7 +260,7 @@ _Mongo.prototype._ensureIndex = function (collectionName, index, options) {
 var CursorDescription = function (collectionName, selector, options) {
   var self = this;
   self.collectionName = collectionName;
-  self.selector = _Mongo._rewriteSelector(selector);
+  self.selector = Meteor.Collection._rewriteSelector(selector);
   self.options = options || {};
 };
 
@@ -726,10 +715,12 @@ _.extend(LiveResultsSet.prototype, {
       --self._addHandleTasksScheduledButNotPerformed;
 
       // Send initial adds.
-      _.each(self._results, function (doc, i) {
-        handle._added(LocalCollection._deepcopy(doc),
-                      self._ordered ? i : undefined);
-      });
+      if (handle._added) {
+        _.each(self._results, function (doc, i) {
+          handle._added(LocalCollection._deepcopy(doc),
+                        self._ordered ? i : undefined);
+        });
+      }
     });
   },
 
diff --git a/packages/mongo-livedata/mongo_livedata_tests.js b/packages/mongo-livedata/mongo_livedata_tests.js
index 0189582920..9e728f5da6 100644
--- a/packages/mongo-livedata/mongo_livedata_tests.js
+++ b/packages/mongo-livedata/mongo_livedata_tests.js
@@ -421,16 +421,19 @@ if (Meteor.isServer) {
     var run = test.runId();
     var coll = new Meteor.Collection("cursorDedup-"+run);
 
-    var observer = function () {
+    var observer = function (noAdded) {
       var output = [];
-      var handle = coll.find({foo: 22}).observe({
-        added: function (doc) {
-          output.push({added: doc._id});
-        },
+      var callbacks = {
         changed: function (newDoc) {
           output.push({changed: newDoc._id});
         }
-      });
+      };
+      if (!noAdded) {
+        callbacks.added = function (doc) {
+          output.push({added: doc._id});
+        };
+      }
+      var handle = coll.find({foo: 22}).observe(callbacks);
       return {output: output, handle: handle};
     };
 
@@ -510,7 +513,63 @@ if (Meteor.isServer) {
     test.length(o2.output, 0);
     // White-box: Different LiveResultsSet.
     test.isTrue(liveResultsSet !== o3.handle._liveResultsSet);
+
+    // Start another handle with no added callback. Regression test for #589.
+    var o4 = observer(true);
+
     o3.handle.stop();
+    o4.handle.stop();
+
     onComplete();
   });
 }
+
+if (Meteor.isServer) {
+  Meteor.methods({
+    createInsecureCollection: function (name) {
+      var c = new Meteor.Collection(name);
+      c._insecure = true;
+      Meteor.publish('c-' + name, function () {
+        return c.find();
+      });
+    }
+  });
+}
+
+testAsyncMulti('mongo-livedata - rewrite selector', [
+  function (test, expect) {
+    var collectionName = Meteor.uuid();
+    if (Meteor.isClient) {
+      Meteor.call('createInsecureCollection', collectionName);
+      Meteor.subscribe('c-' + collectionName);
+    }
+
+    var coll = new Meteor.Collection(collectionName);
+
+    var docId;
+
+    var updateCallback = expect(function (err2) {
+      test.isFalse(err2);
+
+      var doc = coll.findOne(docId);
+      test.isTrue(doc);
+      test.equal(doc.name, "f\noobar");
+      test.equal(doc.value, 43);
+    });
+
+    coll.insert({name: 'f\noobar', value: 42}, expect(function (err1, id) {
+      test.isFalse(err1);
+      test.isTrue(id);
+      docId = id;
+
+      var doc = coll.findOne(docId);
+      test.isTrue(doc);
+      test.equal(doc.name, "f\noobar");
+      test.equal(doc.value, 42);
+
+      // Ensure that "i" and "m" flags are respected by making /B/ match b and
+      // /^/ match at the newline.
+      coll.update({name: /^o+B/im}, {$inc: {value: 1}}, updateCallback);
+    }));
+  }
+]);
diff --git a/packages/spark/patch.js b/packages/spark/patch.js
index 6581e4d173..07a09d5f9e 100644
--- a/packages/spark/patch.js
+++ b/packages/spark/patch.js
@@ -62,11 +62,11 @@ Spark._patch = function(tgtParent, srcParent, tgtBefore, tgtAfter, preservations
             // match succeeded
             lastTgtMatch = tgt;
             if (tgt.firstChild || src.firstChild) {
-              // Don't patch contents of TEXTAREA tag,
-              // which are only the initial contents but
-              // may affect the tag's .value in IE.
-              if (tgt.nodeName !== "TEXTAREA") {
-                // recurse!
+              if (tgt.nodeName !== "TEXTAREA" && tgt.nodeName !== "SELECT") {
+                // Don't patch contents of TEXTAREA tag (which are only the
+                // initial contents but may affect the tag's .value in IE) or of
+                // SELECT (which is specially handled in _copyAttributes).
+                // Otherwise recurse!
                 Spark._patch(tgt, src, null, null, preservations);
               }
             }
@@ -353,13 +353,7 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
 
   // Determine whether tgt has focus; works in all browsers
   // as of FF3, Safari4
-  var target_focused = (tgt === document.activeElement);
-
-  // Is this a control with a user-mutated "value" property?
-  var has_user_value = (
-    (tgt.nodeName === "INPUT" &&
-     (tgt.type === "text")) ||
-      tgt.nodeName === "TEXTAREA");
+  var targetFocused = (tgt === document.activeElement);
 
   ///// Clear current attributes
 
@@ -367,15 +361,30 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
     tgt.style.cssText = '';
 
   var isRadio = false;
+  var finalChecked = null;
   if (tgt.nodeName === "INPUT") {
     // Record for later whether this is a radio button.
     isRadio = (tgt.type === 'radio');
-    // Clearing the attributes of a checkbox won't necessarily
-    // uncheck it, eg in FF12, so we uncheck explicitly
-    // (if necessary; we don't want to generate spurious
-    // propertychange events in old IE).
-    if (tgt.checked === true && src.checked === false) {
-      tgt.checked = false;
+
+    // Figure out whether this should be checked or not. If the re-rendering
+    // changed its idea of checkedness, go with that; otherwsie go with whatever
+    // the control's current setting is.
+    if (isRadio || tgt.type === 'checkbox') {
+      var tgtOriginalChecked = !!tgt._sparkOriginalRenderedChecked &&
+            tgt._sparkOriginalRenderedChecked[0];
+      var srcOriginalChecked = !!src._sparkOriginalRenderedChecked &&
+            src._sparkOriginalRenderedChecked[0];
+      // For radio buttons, we previously saved the checkedness in an expando
+      // property before doing some DOM operations that could wipe it out. For
+      // checkboxes, we can just use the checked property directly.
+      var tgtCurrentChecked = tgt._currentChecked ?
+            tgt._currentChecked[0] : tgt.checked;
+      if (tgtOriginalChecked === srcOriginalChecked) {
+        finalChecked = tgtCurrentChecked;
+      } else {
+        finalChecked = srcOriginalChecked;
+        tgt._sparkOriginalRenderedChecked = [finalChecked];
+      }
     }
   }
 
@@ -405,8 +414,8 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
     // sometimes have a group and sometimes not.
     if (isRadio && name === "name")
       continue;
-    // Never delete the "value" attribute.  It's more effective
-    // to simply overwrite it in the next phase.
+    // Never delete the "value" attribute: we have special three-way diff logic
+    // for it at the end.
     if (name === "value")
       continue;
     // Removing 'src' (e.g. in an iframe) can only be bad.
@@ -444,10 +453,13 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
     // of form controls is sufficiently different in IE from
     // other browsers that we keep the special cases separate.
 
-    tgt.mergeAttributes(src);
+    // Don't copy _sparkOriginalRenderedValue, though.
+    var srcExpando = src._sparkOriginalRenderedValue;
+    src.removeAttribute('_sparkOriginalRenderedValue');
 
-    if (typeof tgt.checked !== "undefined" && src.checked)
-      tgt.checked = src.checked;
+    tgt.mergeAttributes(src);
+    if (srcExpando)
+      src._sparkOriginalRenderedValue = srcExpando;
 
     if (src.name)
       tgt.name = src.name;
@@ -463,8 +475,7 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
         if (name === "type") {
         // can't change type of INPUT in IE; don't support it
         } else if (name === "checked") {
-          tgt.checked = tgt.defaultChecked = (value && value !== "false");
-          tgt.setAttribute("checked", "checked");
+          // handled specially below
         } else if (name === "style") {
           tgt.style.cssText = src.style.cssText;
         } else if (name === "class") {
@@ -477,16 +488,86 @@ Spark._Patcher._copyAttributes = function(tgt, src) {
           if (src.src !== tgt.src)
             tgt.src = src.src;
         } else {
-          tgt.setAttribute(name, value);
+          try {
+            tgt.setAttribute(name, value);
+          } catch (e) {
+            throw new Error("Error copying attribute '" + name + "': " + e);
+          }
         }
       }
     }
   }
 
-  // Copy the control's value, only if tgt doesn't have focus.
-  if (has_user_value) {
-    if (! target_focused)
-      tgt.value = src.value;
+  var originalRenderedValue = function (node) {
+    if (!node._sparkOriginalRenderedValue)
+      return null;
+    return node._sparkOriginalRenderedValue[0];
+  };
+  var srcOriginalRenderedValue = originalRenderedValue(src);
+  var tgtOriginalRenderedValue = originalRenderedValue(tgt);
+
+  // Save the target's current value.
+  var tgtCurrentValue = DomUtils.getElementValue(tgt);
+
+  if (tgt.nodeName === "SELECT") {
+    // Copy over the descendents of the tag (eg, OPTIONs, OPTGROUPs, etc) so
+    // that we get the new version's OPTIONs. (We don't look for any more nested
+    // preserved regions inside the element.)
+    while (tgt.firstChild)
+      tgt.removeChild(tgt.firstChild);
+    while (src.firstChild)
+      tgt.insertBefore(src.firstChild, null);
+    // ... but preserve the original <SELECT>'s value if possible (ie, ignore
+    // any <OPTION SELECTED>s that we may have copied over).
+    DomUtils.setElementValue(tgt, tgtCurrentValue);
   }
 
+  // We preserve the old element's value unless both of the following are true:
+  //   - The newly rendered value is different from the old rendered value: ie,
+  //     something has actually changed on the server.
+  //   - It's unfocused. If it's focused, the user might be editing it, and
+  //     we don't want to update what the user is currently editing (and lose
+  //     the selection, etc).
+  //
+  // After updating the element's value, we update its
+  // _sparkOriginalRenderedValue to match.
+  //
+  // There's a case where we choose to update _sparkOriginalRenderedValue even
+  // though we're not updating the visible value. That's when the element is
+  // focused (preventing us from updating the visible value), but the newly
+  // rendered value matches the visible value. In this case, updating the
+  // visible value would have been a no-op, so we can do the matching
+  // _sparkOriginalRenderedValue update.
+  //
+  // Note that we expect src._sparkOriginalRenderedValue[0] to be equal to
+  // src.value. For <LI>'s, though, there is a value property (the ordinal in
+  // the list) even though there is no value attribute (and thus no saved
+  // _sparkOriginalRenderedValue), so we do have to be sure to do the comparison
+  // with src._sparkOriginalRenderedValue[0] rather than with src.value.
+  if (srcOriginalRenderedValue !== tgtOriginalRenderedValue &&
+      (tgtCurrentValue === srcOriginalRenderedValue || !targetFocused)) {
+    // Update the on-screen value to the newly rendered value, but only if it's
+    // an actual change (a seemingly "no-op" value update resets the selection,
+    // so don't do that!)
+    if (tgtCurrentValue !== srcOriginalRenderedValue)
+      DomUtils.setElementValue(tgt, srcOriginalRenderedValue);
+    // ... and overwrite the saved rendered value too, so that the next time
+    // around we'll be comparing to this rendered value instead of the old one.
+    tgt._sparkOriginalRenderedValue = [srcOriginalRenderedValue];
+  }
+
+  // Deal with checkboxes and radios.
+  if (finalChecked !== null) {
+    // Don't do a no-op write to 'checked', since in some browsers that triggers
+    // events.
+    if (tgt.checked !== finalChecked)
+      tgt.checked = finalChecked;
+
+    // Set various other fields related to checkedness.
+    tgt.defaultChecked = finalChecked;
+    if (finalChecked)
+      tgt.setAttribute("checked", "checked");
+    else
+      tgt.removeAttribute("checked");
+  }
 };
diff --git a/packages/spark/patch_tests.js b/packages/spark/patch_tests.js
index 890c34e808..4d2d698ae8 100644
--- a/packages/spark/patch_tests.js
+++ b/packages/spark/patch_tests.js
@@ -132,12 +132,15 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
         buf.push('<', tagName);
         _.each(kv, function(v,k) {
           allAttrNames[k] = true;
-          buf.push(' ', k, '="', v, '"');
+          buf.push(' ', k);
+          if (v !== 'NO_VALUE')
+            buf.push('="', v, '"');
         });
         buf.push('></', tagName, '>');
         var nodeHtml = buf.join('');
         var frag = DomUtils.htmlToFragment(nodeHtml);
         var n = frag.firstChild;
+        n._sparkOriginalRenderedChecked = [n.checked];
         if (! node) {
           node = n;
         } else {
@@ -159,18 +162,20 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
       check: function() {
         _.each(lastAttrs, function(v,k) {
           var actualAttr;
+          var expectedAttr = v || "";
           if (k === "style") {
             actualAttr = node.style.cssText;
           } else if (k === "class") {
             actualAttr = node.className;
           } else if (k === "checked") {
             actualAttr = String(node.getAttribute(k) || "");
+            if (expectedAttr === "NO_VALUE")
+              expectedAttr = "checked";
             if (actualAttr === "true")
               actualAttr = "checked"; // save IE's butt
           } else {
             actualAttr = String(node.getAttribute(k) || "");
           }
-          var expectedAttr = v || "";
           test.equal(actualAttr, expectedAttr, k);
         });
       },
@@ -227,6 +232,12 @@ Tinytest.add("spark - patch - copyAttributes", function(test) {
   c.copy({type:'checkbox', name:'foo', checked:'checked'});
   c.check();
   test.equal(c.node().checked, true);
+  c.copy({type:'checkbox', name:'foo'});
+  c.check();
+  test.equal(c.node().checked, false);
+  c.copy({type:'checkbox', name:'foo', checked:'NO_VALUE'});
+  c.check();
+  test.equal(c.node().checked, true);
 
   c.copy({type:'checkbox', name:'bar'});
   test.expect_fail(); // changing "name" on a form control won't take in IE
diff --git a/packages/spark/spark.js b/packages/spark/spark.js
index 861bf417c1..866c64db09 100644
--- a/packages/spark/spark.js
+++ b/packages/spark/spark.js
@@ -304,6 +304,23 @@ _.extend(Spark._Renderer.prototype, {
     });
     self.annotations = {};
 
+    // Save original versions of every 'value' property. We want elements that
+    // have a value *attribute*, as well as form elements that have a value
+    // property but no value attribute (textarea and select).
+    //
+    // We save it in a one-element array expando. We use the array because IE8
+    // gets confused by expando properties with scalar values and exposes them
+    // as HTML attributes.
+    //
+    // We also save the values of CHECKED for radio and checkboxes.
+    _.each(DomUtils.findAll(ret, '[value], textarea, select'), function (node) {
+      node._sparkOriginalRenderedValue = [DomUtils.getElementValue(node)];
+    });
+    _.each(DomUtils.findAll(ret, 'input[type=checkbox], input[type=radio]'),
+           function (node) {
+      node._sparkOriginalRenderedChecked = [!!node.checked];
+    });
+
     return ret;
   }
 
@@ -526,6 +543,19 @@ var pathForRange = function (r) {
 // `range` is a region of `document`. Modify it in-place so that it
 // matches the result of Spark.render(htmlFunc), preserving landmarks.
 Spark.renderToRange = function (range, htmlFunc) {
+  // `range` may be out-of-document and we don't check here.
+  // XXX should we?
+  //
+  // Explicit finalization of ranges (done within Spark or by a call to
+  // Spark.finalize) prevents us from being called in the first place.
+  // The newly rendered material will be checked to see if it's in the
+  // document by scheduleOnscreenSetUp's scheduled setup.
+  // However, if range is not valid, bail out now before running
+  // htmlFunc.
+  var startNode = range.firstNode();
+  if (! startNode || ! startNode.parentNode)
+    return;
+
   var renderer = new Spark._Renderer();
 
   // Call 'func' for each landmark in 'range'. Pass two arguments to
@@ -553,6 +583,18 @@ Spark.renderToRange = function (range, htmlFunc) {
     notes.originalRange = landmarkRange;
   });
 
+  // Once we render the new fragment, as soon as it is placed into the DOM (even
+  // temporarily), if any radio buttons in the new framgent are checked, any
+  // radio buttons with the same name in the entire document will be unchecked
+  // (since only one radio button of a given name can be checked at a time). So
+  // we save the current checked value of all radio buttons in an expando.
+  var radios = DomUtils.findAllClipped(
+    range.containerNode(), 'input[type=radio]',
+    range.firstNode(), range.lastNode());
+  _.each(radios, function (node) {
+    node._currentChecked = [!!node.checked];
+  });
+
   var frag = renderer.materialize(htmlFunc);
 
   DomUtils.wrapFragmentForContainer(frag, range.containerNode());
@@ -576,8 +618,18 @@ Spark.renderToRange = function (range, htmlFunc) {
   // find preservation roots that come from landmarks enclosing the
   // updated region
   var walk = range;
-  while ((walk = findParentOfType(Spark._ANNOTATION_LANDMARK, walk)))
-    pc.addRoot(walk.preserve, range, tempRange, walk.containerNode());
+  while ((walk = walk.findParent())) {
+    if (! walk.firstNode().parentNode)
+      // we're in a DOM island with a top-level range (not really
+      // allowed, but could happen if `range` is on nodes that
+      // manually removed.
+      // XXX check for this sooner; hard to reason about this function
+      // on a "malformed" liverange tree
+      break;
+
+    if (walk.type === Spark._ANNOTATION_LANDMARK, walk)
+      pc.addRoot(walk.preserve, range, tempRange, walk.containerNode());
+  }
 
   pc.addRoot(Spark._globalPreserves, range, tempRange);
 
diff --git a/packages/spark/spark_tests.js b/packages/spark/spark_tests.js
index fe268de1f9..04a598695e 100644
--- a/packages/spark/spark_tests.js
+++ b/packages/spark/spark_tests.js
@@ -2638,13 +2638,14 @@ testAsyncMulti(
   })());
 
 
-Tinytest.add("spark - controls", function(test) {
-
-  // Radio buttons
-
+Tinytest.add("spark - controls - radio", function(test) {
   var R = ReactiveVar("");
+  var R2 = ReactiveVar("");
   var change_buf = [];
   var div = OnscreenDiv(renderWithPreservation(function() {
+    // Re-render when R2 is changed, even though it doesn't affect HTML.
+    R2.get();
+
     var buf = [];
     buf.push("Band: ");
     _.each(["AM", "FM", "XM"], function(band) {
@@ -2691,6 +2692,12 @@ Tinytest.add("spark - controls", function(test) {
   test.equal(_.pluck(btns, 'checked'), [true, false, false]);
   test.equal(div.text(), "Band: AM");
 
+  R2.set("change");
+  Meteor.flush();
+  test.length(change_buf, 0);
+  test.equal(_.pluck(btns, 'checked'), [true, false, false]);
+  test.equal(div.text(), "Band: AM");
+
   clickElement(btns[1]);
   test.equal(change_buf, ['FM']);
   change_buf.length = 0;
@@ -2713,50 +2720,179 @@ Tinytest.add("spark - controls", function(test) {
   test.equal(div.text(), "Band: FM");
 
   div.kill();
+});
 
-  // Textarea
-
-  R = ReactiveVar({x:"test"});
-  div = OnscreenDiv(renderWithPreservation(function() {
-    return '<textarea id="mytextarea">This is a '+
-      R.get().x+'</textarea>';
+Tinytest.add("spark - controls - checkbox", function(test) {
+  var labels = ["Foo", "Bar", "Baz"];
+  var Rs = {};
+  _.each(labels, function (label) {
+    Rs[label] = ReactiveVar(false);
+  });
+  var changeBuf = [];
+  var div = OnscreenDiv(renderWithPreservation(function() {
+    var buf = [];
+    _.each(labels, function (label) {
+      var checked = Rs[label].get() ? 'checked="checked"' : '';
+      buf.push('<input type="checkbox" name="checky" '+
+               'value="'+label+'" '+checked+'/>');
+    });
+    return buf.join('');
   }));
-  div.show(true);
 
-  var textarea = div.node().firstChild;
-  test.equal(textarea.nodeName, "TEXTAREA");
-  test.equal(textarea.value, "This is a test");
-
-  // value updates reactively
-  R.set({x:"fridge"});
   Meteor.flush();
-  test.equal(textarea.value, "This is a fridge");
 
-  // ...unless focused
-  focusElement(textarea);
-  R.set({x:"frog"});
-  Meteor.flush();
-  test.equal(textarea.value, "This is a fridge");
+  // get the three boxes; they should be considered 'labeled' by the patcher and
+  // not change identities!
+  var boxes = nodesToArray(div.node().getElementsByTagName("INPUT"));
 
-  // blurring and re-setting works
-  blurElement(textarea);
-  Meteor.flush();
-  test.equal(textarea.value, "This is a fridge");
-  R.set({x:"frog"});
-  Meteor.flush();
-  test.equal(textarea.value, "This is a frog");
+  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
 
-  // Setting a value (similar to user typing) should
-  // not prevent value from being updated reactively.
-  textarea.value = "foobar";
-  R.set({x:"photograph"});
+  // Re-render with first one checked.
+  Rs.Foo.set(true);
   Meteor.flush();
-  test.equal(textarea.value, "This is a photograph");
+  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
 
+  // Re-render with first one unchecked again.
+  Rs.Foo.set(false);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
+
+  // User clicks the second one.
+  clickElement(boxes[1]);
+  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [false, true, false]);
+
+  // Re-render with third one checked. Second one should stay checked because
+  // it's a user update!
+  Rs.Baz.set(true);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [false, true, true]);
+
+  // User turns second and third off.
+  clickElement(boxes[1]);
+  clickElement(boxes[2]);
+  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
+
+  // Re-render with first one checked. Third should stay off because it's a user
+  // update!
+  Rs.Foo.set(true);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [true, false, false]);
+
+  // Re-render with first one unchecked. Third should still stay off.
+  Rs.Foo.set(false);
+  Meteor.flush();
+  test.equal(_.pluck(boxes, 'checked'), [false, false, false]);
 
   div.kill();
 });
 
+_.each(['textarea', 'text', 'password', 'submit', 'button',
+        'reset', 'select', 'hidden'], function (type) {
+  Tinytest.add("spark - controls - " + type, function(test) {
+    var R = ReactiveVar({x:"test"});
+    var R2 = ReactiveVar("");
+    var div = OnscreenDiv(renderWithPreservation(function() {
+      // Re-render when R2 is changed, even though it doesn't affect HTML.
+      R2.get();
+      if (type === 'textarea') {
+        return '<textarea id="someId">This is a ' + R.get().x + '</textarea>';
+      } else if (type === 'select') {
+        var options = ['This is a test', 'This is a fridge',
+                       'This is a frog', 'foobar', 'This is a photograph',
+                       'This is a monkey', 'This is a donkey'];
+        return '<select id="someId">' + _.map(options, function (o) {
+          var maybeSel = ('This is a ' + R.get().x) === o ? 'selected' : '';
+          return '<option ' + maybeSel + '>' + o + '</option>';
+        }).join('') + '</select>';
+      } else {
+        return '<input type="' + type + '" id="someId" value="This is a ' +
+          R.get().x + '">';
+      }
+    }));
+    div.show(true);
+    var canFocus = (type !== 'hidden');
+
+    var input = div.node().firstChild;
+    if (type === 'textarea' || type === 'select') {
+      test.equal(input.nodeName, type.toUpperCase());
+    } else {
+      test.equal(input.nodeName, 'INPUT');
+      test.equal(input.type, type);
+    }
+    test.equal(DomUtils.getElementValue(input), "This is a test");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a test"]);
+
+    // value updates reactively
+    R.set({x:"fridge"});
+    Meteor.flush();
+    test.equal(DomUtils.getElementValue(input), "This is a fridge");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a fridge"]);
+
+    if (canFocus) {
+      // ...unless focused
+      focusElement(input);
+      R.set({x:"frog"});
+      Meteor.flush();
+      test.equal(DomUtils.getElementValue(input), "This is a fridge");
+      test.equal(input._sparkOriginalRenderedValue, ["This is a fridge"]);
+
+      // blurring and re-setting works
+      blurElement(input);
+      Meteor.flush();
+      test.equal(DomUtils.getElementValue(input), "This is a fridge");
+      test.equal(input._sparkOriginalRenderedValue, ["This is a fridge"]);
+    }
+    R.set({x:"frog"});
+    Meteor.flush();
+    test.equal(DomUtils.getElementValue(input), "This is a frog");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a frog"]);
+
+    // Setting a value (similar to user typing) should prevent value from being
+    // reverted if the div is re-rendered but the rendered value (ie, R) does
+    // not change.
+    DomUtils.setElementValue(input, "foobar");
+    R2.set("change");
+    Meteor.flush();
+    test.equal(DomUtils.getElementValue(input), "foobar");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a frog"]);
+
+    // ... but if the actual rendered value changes, that should take effect.
+    R.set({x:"photograph"});
+    Meteor.flush();
+    test.equal(DomUtils.getElementValue(input), "This is a photograph");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a photograph"]);
+
+    // If the rendered value and user value change in the same way (eg, the user
+    // changed it and then invoked a menthod that set the database value based
+    // on what they changed), make sure that the _sparkOriginalRenderedValue
+    // gets updated too.
+    DomUtils.setElementValue(input, "This is a monkey");
+    R.set({x:"monkey"});
+    Meteor.flush();
+    test.equal(DomUtils.getElementValue(input), "This is a monkey");
+    test.equal(input._sparkOriginalRenderedValue, ["This is a monkey"]);
+
+    if (canFocus) {
+      // The same as the previous test... except make sure that it still works
+      // if the input is focused. ie, imagine that the user edited the field and
+      // hit enter with the field still focused, updating the database to match
+      // the field and keeping the field focused.
+      DomUtils.setElementValue(input, "This is a donkey");
+      focusElement(input);
+      R.set({x:"donkey"});
+      Meteor.flush();
+      test.equal(DomUtils.getElementValue(input), "This is a donkey");
+      test.equal(input._sparkOriginalRenderedValue, ["This is a donkey"]);
+    }
+
+    div.kill();
+  });
+});
+
 Tinytest.add("spark - oldschool landmark matching", function(test) {
 
   // basic created / onscreen / offscreen callback flow
@@ -3695,4 +3831,56 @@ Tinytest.add("spark - legacy preserve names", function (test) {
   Meteor.flush();
 });
 
+Tinytest.add("spark - update defunct range", function (test) {
+  // Test that Spark doesn't freak out if it tries to update
+  // a LiveRange on nodes that have been taken out of the document.
+  //
+  // See https://github.com/meteor/meteor/issues/392.
+
+  var R = ReactiveVar("foo");
+
+  var div = OnscreenDiv(Spark.render(function () {
+    return "<p>" + Spark.isolate(function() {
+      return R.get();
+    }) + "</p>";
+  }));
+
+  test.equal(div.html(), "<p>foo</p>");
+  R.set("bar");
+  Meteor.flush();
+  test.equal(R.numListeners(), 1);
+  test.equal(div.html(), "<p>bar</p>");
+  test.equal(div.node().firstChild.nodeName, "P");
+  div.node().firstChild.innerHTML = '';
+  R.set("baz");
+  Meteor.flush(); // should throw no errors
+  // will be 1 if our isolate func was run.
+  test.equal(R.numListeners(), 0);
+
+  /////
+
+  R = ReactiveVar("foo");
+
+  div = OnscreenDiv(Spark.render(function () {
+    return "<p>" + Spark.setDataContext(
+      {},
+      "<span>" + Spark.isolate(function() {
+        return R.get();
+      }) + "</span>") + "</p>";
+  }));
+
+  test.equal(div.html(), "<p><span>foo</span></p>");
+  R.set("bar");
+  Meteor.flush();
+  test.equal(R.numListeners(), 1);
+  test.equal(div.html(), "<p><span>bar</span></p>");
+  test.equal(div.node().firstChild.nodeName, "P");
+  div.node().firstChild.innerHTML = '';
+  R.set("baz");
+  Meteor.flush(); // should throw no errors
+  // will be 1 if our isolate func was run.
+  test.equal(R.numListeners(), 0);
+
+});
+
 })();
diff --git a/packages/stream/stream_client.js b/packages/stream/stream_client.js
index 43aa9b57d7..d479ab6a79 100644
--- a/packages/stream/stream_client.js
+++ b/packages/stream/stream_client.js
@@ -1,9 +1,10 @@
-// @param url {String} URL to Meteor app or sockjs endpoint (deprecated)
-//   "http://subdomain.meteor.com/sockjs" or "/sockjs"
+// @param url {String} URL to Meteor app
+//   "http://subdomain.meteor.com/" or "/" or
+//   "ddp+sockjs://foo-**.meteor.com/sockjs"
 Meteor._Stream = function (url) {
   var self = this;
 
-  self.url = Meteor._Stream._toSockjsUrl(url);
+  self.rawUrl = url;
   self.socket = null;
   self.event_callbacks = {}; // name -> [callback]
   self.server_id = null;
@@ -63,9 +64,12 @@ Meteor._Stream = function (url) {
 };
 
 _.extend(Meteor._Stream, {
-  // @param url {String} URL to Meteor app, or to sockjs endpoint (deprecated)
+  // @param url {String} URL to Meteor app, eg:
+  //   "/" or "madewith.meteor.com" or "https://foo.meteor.com"
+  //   or "ddp+sockjs://ddp--****-foo.meteor.com/sockjs"
   // @returns {String} URL to the sockjs endpoint, e.g.
   //   "http://subdomain.meteor.com/sockjs" or "/sockjs"
+  //   or "https://ddp--1234-foo.meteor.com/sockjs"
   _toSockjsUrl: function(url) {
     // XXX from Underscore.String (http://epeli.github.com/underscore.string/)
     var startsWith = function(str, starts) {
@@ -77,14 +81,32 @@ _.extend(Meteor._Stream, {
         str.substring(str.length - ends.length) === ends;
     };
 
+    var ddpUrlMatch = url.match(/^ddp(i?)\+sockjs:\/\//);
+    if (ddpUrlMatch) {
+      // Remove scheme and split off the host.
+      var urlAfterDDP = url.substr(ddpUrlMatch[0].length);
+      var newScheme = ddpUrlMatch[1] === 'i' ? 'http' : 'https';
+      var slashPos = urlAfterDDP.indexOf('/');
+      var host =
+            slashPos === -1 ? urlAfterDDP : urlAfterDDP.substr(0, slashPos);
+      var rest = slashPos === -1 ? '' : urlAfterDDP.substr(slashPos);
+
+      // In the host (ONLY!), change '*' characters into random digits. This
+      // allows different stream connections to connect to different hostnames
+      // and avoid browser per-hostname connection limits.
+      host = host.replace(/\*/g, function () {
+        return Math.floor(Math.random()*10);
+      });
+
+      return newScheme + '://' + host + rest;
+    }
+
     // Prefix FQDNs but not relative URLs
     if (url.indexOf("://") === -1 && !startsWith(url, "/")) {
       url = "http://" + url;
     }
 
-    if (endsWith(url, "/sockjs"))
-      return url;
-    else if (endsWith(url, "/"))
+    if (endsWith(url, "/"))
       return url + "sockjs";
     else
       return url + "/sockjs";
@@ -311,12 +333,17 @@ _.extend(Meteor._Stream.prototype, {
     var self = this;
     self._cleanup_socket(); // cleanup the old socket, if there was one.
 
-    self.socket = new SockJS(self.url, undefined, {
-      debug: false, protocols_whitelist: [
-        // only allow polling protocols. no websockets or streaming.
-        // streaming makes safari spin, and websockets hurt chrome.
-        'xdr-polling', 'xhr-polling', 'iframe-xhr-polling', 'jsonp-polling'
-      ]});
+    // Convert raw URL to SockJS URL each time we open a connection, so that we
+    // can connect to random hostnames and get around browser per-host
+    // connection limits.
+    self.socket = new SockJS(
+      Meteor._Stream._toSockjsUrl(self.rawUrl),
+      undefined, {
+        debug: false, protocols_whitelist: [
+          // only allow polling protocols. no websockets or streaming.
+          // streaming makes safari spin, and websockets hurt chrome.
+          'xdr-polling', 'xhr-polling', 'iframe-xhr-polling', 'jsonp-polling'
+        ]});
     self.socket.onmessage = function (data) {
       // first message we get when we're connecting goes to _connected,
       // which connects us. All subsequent messages (while connected) go to
diff --git a/packages/stream/stream_tests.js b/packages/stream/stream_tests.js
index 5a1d439557..496fb1fa73 100644
--- a/packages/stream/stream_tests.js
+++ b/packages/stream/stream_tests.js
@@ -35,36 +35,36 @@ testAsyncMulti("stream - reconnect", [
 
 Tinytest.add("stream - sockjs urls are computed correctly", function(test) {
   var testHasSockjsUrl = function(raw, expectedSockjsUrl) {
-    test.equal(Meteor._Stream._toSockjsUrl(raw), expectedSockjsUrl);
+    var actual = Meteor._Stream._toSockjsUrl(raw);
+    if (expectedSockjsUrl instanceof RegExp)
+      test.isTrue(actual.match(expectedSockjsUrl));
+    else
+      test.equal(actual, expectedSockjsUrl);
   };
 
-  testHasSockjsUrl("http://subdomain.meteor.com/sockjs",
-                   "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("http://subdomain.meteor.com/",
                    "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("http://subdomain.meteor.com",
                    "http://subdomain.meteor.com/sockjs");
-  testHasSockjsUrl("subdomain.meteor.com/sockjs",
-                   "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("subdomain.meteor.com/",
                    "http://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("subdomain.meteor.com",
                    "http://subdomain.meteor.com/sockjs");
-  testHasSockjsUrl("/sockjs", "/sockjs");
   testHasSockjsUrl("/", "/sockjs");
 
-  testHasSockjsUrl("http://localhost:3000/sockjs",
-                   "http://localhost:3000/sockjs");
   testHasSockjsUrl("http://localhost:3000/", "http://localhost:3000/sockjs");
   testHasSockjsUrl("http://localhost:3000", "http://localhost:3000/sockjs");
   testHasSockjsUrl("localhost:3000", "http://localhost:3000/sockjs");
 
-  testHasSockjsUrl("https://subdomain.meteor.com/sockjs",
-                   "https://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("https://subdomain.meteor.com/",
                    "https://subdomain.meteor.com/sockjs");
   testHasSockjsUrl("https://subdomain.meteor.com",
                    "https://subdomain.meteor.com/sockjs");
+
+  testHasSockjsUrl("ddp+sockjs://ddp--****-foo.meteor.com/sockjs",
+                   /^https:\/\/ddp--\d\d\d\d-foo\.meteor\.com\/sockjs$/);
+  testHasSockjsUrl("ddpi+sockjs://ddp--****-foo.meteor.com/sockjs",
+                   /^http:\/\/ddp--\d\d\d\d-foo\.meteor\.com\/sockjs$/);
 });
 
 testAsyncMulti("stream - /websocket is a websocket endpoint", [
diff --git a/packages/test-helpers/canonicalize_html.js b/packages/test-helpers/canonicalize_html.js
index 554121d9fa..25c3d9c32a 100644
--- a/packages/test-helpers/canonicalize_html.js
+++ b/packages/test-helpers/canonicalize_html.js
@@ -11,23 +11,33 @@ var canonicalizeHtml = function(html) {
   h = h.replace(/[\n\r]/g, '');
   // make tag attributes uniform
   h = h.replace(/<(\w+)\s+(.*?)\s*>/g, function(m, tagName, attrs) {
+    // Drop expando property used by Sizzle (part of jQuery) which leaks into
+    // attributes in IE8. Note that its value always contains spaces.
+    attrs = attrs.replace(/sizcache[0-9]+="[^"]*"/g, ' ');
     attrs = attrs.replace(/\s*=\s*/g, '=');
+    attrs = attrs.replace(/^\s+/g, '');
+    attrs = attrs.replace(/\s+$/g, '');
     attrs = attrs.replace(/\s+/g, ' ');
     var attrList = attrs.split(' ');
     // put attributes in alphabetical order
     attrList.sort();
+    var tagContents = [tagName];
     for(var i=0; i<attrList.length; i++) {
       var a = attrList[i].split('=');
       if (a.length < 2)
         a.push(a[0]); // things like checked=checked, in theory
       var key = a[0];
+      // Drop another expando property used by Sizzle.
+      if (key === 'sizset')
+        continue;
       var value = a[1];
       value = value.replace(/["'`]/g, '"');
       if (value.charAt(0) !== '"')
         value = '"'+value+'"';
-      attrList[i] = key+'='+value;
+      tagContents.push(key+'='+value);
     }
-    return '<'+tagName+' '+attrList.join(' ')+'>';
+
+    return '<'+tagContents.join(' ')+'>';
   });
   return h;
 };
diff --git a/packages/test-in-browser/driver.html b/packages/test-in-browser/driver.html
index 6656e73a3c..7f83892ce4 100644
--- a/packages/test-in-browser/driver.html
+++ b/packages/test-in-browser/driver.html
@@ -21,6 +21,12 @@
     {{/if}}
   {{/if}}
 
+  <ul class="failedTests">
+    {{#each failedTests}}
+      <li>{{this}}</li>
+    {{/each}}
+  </ul>
+
   <div class="test_table">
     {{#each data}}
       {{> test_group this}}
diff --git a/packages/test-in-browser/driver.js b/packages/test-in-browser/driver.js
index 550ca5f834..ea4c4e4cbd 100644
--- a/packages/test-in-browser/driver.js
+++ b/packages/test-in-browser/driver.js
@@ -72,6 +72,10 @@ Template.test_table.data = function() {
   resultDeps.addCurrentContext();
   return resultTree;
 };
+Template.test_table.failedTests = function() {
+  resultDeps.addCurrentContext();
+  return failedTests;
+};
 
 Template.test.test_status_display = function() {
   var status = _testStatus(this);
@@ -200,6 +204,7 @@ Template.event.is_debuggable = function() {
 
 
 var resultTree = [];
+var failedTests = [];
 var resultDeps = new Meteor.deps._ContextSet;
 
 var _resultsChanged = function() {
@@ -266,7 +271,10 @@ var _findTestForResults = function (results) {
                                   t.server === server; });
   if (! test) {
     // create test
-    test = {name: testName, parent: group, server: server};
+    var nameParts = _.clone(groupPath);
+    nameParts.push(testName);
+    var fullName = nameParts.join(' - ');
+    test = {name: testName, parent: group, server: server, fullName: fullName};
     group.tests.push(test);
   }
 
@@ -294,6 +302,15 @@ var reportResults = function(results) {
     test.events = out;
   }
 
+  if (_testStatus(test) === "failed") {
+    // Expand a failed test (but only set this if the user hasn't clicked on the
+    // test name yet).
+    if (test.expanded === undefined)
+      test.expanded = true;
+    if (!_.contains(failedTests, test.fullName))
+      failedTests.push(test.fullName);
+  }
+
   _.defer(_throttled_update);
 };
 
diff --git a/packages/tinytest/tinytest.js b/packages/tinytest/tinytest.js
index 894fa6cbea..c283aa6580 100644
--- a/packages/tinytest/tinytest.js
+++ b/packages/tinytest/tinytest.js
@@ -50,6 +50,27 @@ _.extend(TestCaseResults.prototype, {
     if (self.stop_at_offset)
       self.stop_at_offset--;
 
+    // Get filename and line number of failure if we're using v8 (Chrome or
+    // Node).
+    if (Error.captureStackTrace) {
+      var savedPrepareStackTrace = Error.prepareStackTrace;
+      Error.prepareStackTrace = function(_, stack){ return stack; };
+      var err = new Error;
+      Error.captureStackTrace(err);
+      var stack = err.stack;
+      Error.prepareStackTrace = savedPrepareStackTrace;
+      for (var i = stack.length - 1; i >= 0; --i) {
+        var frame = stack[i];
+        // Heuristic: use the OUTERMOST line which is in a _test.js or _tests.js
+        // file (this is less likely to be a test helper function).
+        if (frame.getFileName().match(/_tests?\.js/)) {
+          doc.filename = frame.getFileName();
+          doc.line = frame.getLineNumber();
+          break;
+        }
+      }
+    }
+
     self.onEvent({
         type: (self.expecting_failure ? "expected_fail" : "fail"),
         details: doc,
@@ -116,6 +137,14 @@ _.extend(TestCaseResults.prototype, {
       this.fail({type: "instanceOf"}); // XXX what other data?
   },
 
+  matches: function (actual, regexp, message) {
+    if (regexp.test(actual))
+      this.ok();
+    else
+      this.fail({type: "matches", message: message,
+                 actual: actual, regexp: regexp.toString()});
+  },
+
   // XXX nodejs assert.throws can take an expected error, as a class,
   // regular expression, or predicate function..
   throws: function (f) {
diff --git a/packages/tinytest/tinytest_client.js b/packages/tinytest/tinytest_client.js
index a53885f73b..5c07a4a487 100644
--- a/packages/tinytest/tinytest_client.js
+++ b/packages/tinytest/tinytest_client.js
@@ -35,13 +35,15 @@ Meteor._runTestsEverywhere = function (onReport, onComplete) {
     }
   });
 
-  Meteor.subscribe(Meteor._ServerTestResultsSubscription, runId);
+  var handle = Meteor.subscribe(Meteor._ServerTestResultsSubscription, runId);
 
   Meteor.call('tinytest/run', runId, function (error, result) {
     if (error)
       // XXX better report error
       throw new Error("Test server returned an error");
     remoteComplete = true;
+    handle.stop();
+    Meteor.call('tinytest/clearResults', runId);
     maybeDone();
   });
 };
diff --git a/packages/tinytest/tinytest_server.js b/packages/tinytest/tinytest_server.js
index 2c9636e29f..b7d274448f 100644
--- a/packages/tinytest/tinytest_server.js
+++ b/packages/tinytest/tinytest_server.js
@@ -48,17 +48,21 @@
       };
 
       var onComplete = function() {
-        _.each(handlesForRun[runId], function (handle) {
-          handle.stop();
-        });
-        delete handlesForRun[runId];
-        delete reportsForRun[runId];
         future.ret();
       };
 
       Meteor._runTests(onReport, onComplete);
 
       future.wait();
+    },
+    'tinytest/clearResults': function (runId) {
+      _.each(handlesForRun[runId], function (handle) {
+        // XXX this doesn't actually notify the client that it has been
+        // unsubscribed.
+        handle.stop();
+      });
+      delete handlesForRun[runId];
+      delete reportsForRun[runId];
     }
   });
 }());
diff --git a/packages/uuid/uuid.js b/packages/uuid/uuid.js
index 650046f66c..ce41152ea3 100644
--- a/packages/uuid/uuid.js
+++ b/packages/uuid/uuid.js
@@ -112,7 +112,7 @@ Meteor.uuid = function () {
     s[i] = hexDigits.substr(Math.floor(Meteor.random() * 0x10), 1);
   }
   s[14] = "4";
-  s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);
+  s[19] = hexDigits.substr((parseInt(s[19],16) & 0x3) | 0x8, 1);
   s[8] = s[13] = s[18] = s[23] = "-";
 
   var uuid = s.join("");